Imported Upstream version 0.6.9

181 files changed, 29157 insertions, 29887 deletions

diff --git a/Makefile.in b/Makefile.in
index e3c0d045..33cfac41 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -269,6 +269,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/NEWS b/NEWS
index a71264ac..9c5d3873 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,203 @@
+[6/8/2012]
+Version 0.6.9                               "All in a days work"
+
+Error conditions are much stricter, detecting errors is more
+reliable, and the exit status of all command-line actions is
+well-defined.
+
+All commands will return one of these values as their exit
+status:
+
+      0 – success
+      1 – user aborted (install, remove, …); or
+          no matches (search, versions, why, why-not)
+    100 – failure
+
+Most commands will now fail *without* proceeding if any
+package arguments are not available, or are not available in
+the requested version or archive.  Specifying a virtual
+package which does not have exactly one provider will also
+result in failure.
+
+Finally, install actions will not proceed if any package
+fails to download correctly.  The option --fix-missing is
+added to override this and the old behaviour can be restored
+by setting Aptitude::CmdLine::Fix-Missing in apt.conf.
+
+This is a major change from previous versions where the
+program would have proceeded and possibly exited with a
+status indicating success (0) despite some requested actions
+being either invalid or ineffective.  The new, stricter
+behaviour is desirable for two reasons:
+
+ i. to prevent the situation where a request to replace one
+    set of packages with another set proceeds when (some of)
+    the replacements are not found or unavailable could
+    cause the undesired removal of arbitrary other packages;
+
+ii. to make the program more atomic and reliable when used
+    for automated tasks – by considering the entire request
+    as being essential to success another program can rely
+    on an exit status of 0 to mean that the request was
+    completely carried out.
+
+- Crashes and serious errors:
+
+  * [cmdline]: install and similar actions have much
+               stronger error checking and will exit more
+               reliably with non-zero status on failures
+
+               Failures which result in no action and a
+               non-zero exit status (100):
+               - a package argument does not exactly name
+                 an available package;
+                 (Closes: #576212) (LP: #919216)
+               - a versioned argument requests a version
+                 which is not available for every package
+                 it applies to;
+                 (Closes: #590686) (LP: #585408)
+
+  * [cmdline]: An install run will no longer proceed if any
+               package was unavailable or failed to download
+               correctly, instead an error will be shown
+               and exit with non-zero status (100).
+               (Closes: #121313, #302784, #639789)
+               (LP: #734737)
+
+               The old behaviour can be obtained with the new
+               --fix-missing option or setting
+               Aptitude::CmdLine::Fix-Missing.
+
+  * [cmdline]: --visual-preview exits with non-zero status:
+               - user quits (1);
+               - a package fails to download and the user
+                 chooses not to continue (100); or
+               - a package fails to install (100).
+               (Closes: #282408)
+
+  * [cmdline]: changelog exits with non-zero status on any
+               error (Closes: #675833)
+
+- New features:
+
+  * [cmdline]: Regular expressions are now supported to match names
+               (same as apt-utils):
+
+                $ aptitude show ^tf$
+
+               Previously this would result in a "no such package"
+               error.
+
+  * New aliases for some command-line options:
+    --yes, for --assume-yes (apt-get)
+    --default-release, for --target-release (apt-utils)
+    --install-on-startup, for -i
+    --update-on-startup, for -u
+
+  * New configuration item:
+    Aptitude::CmdLine::Sorting, equivalent to --sort
+
+  * [all]: ?architecture search terms now support using specification
+           strings and wildcards (for example, “linux-any�) as defined
+           in Debian Policy § 11.1 “Architecture specification
+           strings�.
+
+  * [all]: Support downloading changelogs for packages on
+           third-party sites by guessing the URI. (LP: #563155)
+
+  * [all]: New sort policy 'debsize' for sorting by package size.
+           Thanks to Marcel Partap.
+           
+- Minor bugs:
+
+  * handle "-qq" like other apt-utils
+  * properly process all -o command line options (Closes: #587671)
+  * unknown command line options trigger an error (Closes: #434502)
+  * --add-user-tag-to, --remove-user-tag-from are working;
+    no bug reports suggests that noone has noticed they
+    were broken, but they work now anyway
+
+  * [cmdline]: Virtual packages which have an already
+               installed provider are only skipped when the
+               requested action is to install them.
+
+  * [cmdline]: search exit with status 1 if it found no
+               matches (Closes: #497299)
+
+  * [cmdline]: why exits with status 1 if it found no
+               reasons given the particular arguments
+
+  * [cmdline]: Package arguments without an arch-qualifier
+               will also consider foreign-arch packages, in
+               order of preference.  (LP: #892074)
+
+  * [cmdline]: Package arguments can use '*' wildcard in their
+               arch-qualifier to select all matching packages,
+               where 'any' would select only the first such
+               package.
+
+  * [all]: use up-to-date changelog uri construction from apt-get
+           using APT::Changelogs::Server
+
+  * [all]: drop disused Aptitude::Changelog-URL-Template
+
+  * [cmdline]: update to changelog logic:
+               - remove extraneous guess-work with source packages,
+                 which happened to also download the wrong changelog
+                 sometimes (Closes: #631464)
+               - changelog download works with no deb-src lines, so
+                 we don't need to instruct the user to add any
+                 (Closes: #587775, #537393)
+
+  * [curses]: Do not group packages as tasks based on their name,
+              rather, use their section.  (Closes: #679602)
+
+- Internal changes:
+
+  * Unified the way packages are selected from command line
+    arguments.
+
+  * Use apt's CommandLine parser
+
+    Previously aptitude was using it's own command line
+    parser implemented on top of getopt.  Replacing this
+    with the standard apt class means there are no longer
+    subtle quirks with our parser (such as "-qq" not
+    being valid when it is fine for other apt programs).
+
+  * download_install_manager.cc:
+    - repeat if package manager result is DoAgain;
+    - report all download errors not just the first;
+
+  * Use standard apt-xapian-index location, rather than libept.
+
+  * Read tags from debtags database even when libept is
+    disabled, but fall back to Packages files if the database
+    is not available. (Closes: #501732)
+
+- Cosmetic and UI bugs:
+
+  * [cmdline]: Use arch-qualified names for virtual packages in
+               more places as this is what apt-utils do.
+
+  * [cmdline]: Most errors are now displayed at the end of a command's
+               output which makes them easier to spot when there is
+               lots of output. (Closes: #430392)
+
+- Build system changes:
+
+  * Using libept is optional and disabled by default.  Use
+    --enable-ept with configure to turn it on.
+    (Closes: #504153)
+
+- Documentation:
+
+  * [doc]: add section on exit status to the man page
+
+- Translation updates:
+
+  * Polish (Closes: #678153)
+
 [5/11/2012]
 Version 0.6.8                               "Never need a reason,
                                              never need a rhyme"
diff --git a/buildlib/Makefile.in b/buildlib/Makefile.in
index 8020beea..6ffbc300 100644
--- a/buildlib/Makefile.in
+++ b/buildlib/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/config.h.in b/config.h.in
index 81385a8d..cc7896f9 100644
--- a/config.h.in
+++ b/config.h.in
@@ -292,30 +292,9 @@
 /* Set to true if apt is DDTP-enabled */
 #undef HAVE_DDTP
 
-/* Backwards compatibility symbol; must always be defined. */
+/* Define if the ept library is to be used. */
 #undef HAVE_EPT
 
-/* Define if ept/axi/axi.h can provide docids. */
-#undef HAVE_EPT_AXI
-
-/* Define if ept::debtags::Facet exists */
-#undef HAVE_EPT_DEBTAGS_FACET
-
-/* Define if ept::debtags::Facet exists and supports description retrieval. */
-#undef HAVE_EPT_DEBTAGS_FACET_DESCRIPTION
-
-/* Define if ept::debtags::Facet exists and supports description retrieval. */
-#undef HAVE_EPT_DEBTAGS_FACET_NAME
-
-/* Define if ept::debtags::Tag exists. */
-#undef HAVE_EPT_DEBTAGS_TAG
-
-/* Define if ept::debtags::Tag exists and supports description retrieval. */
-#undef HAVE_EPT_DEBTAGS_TAG_DESCRIPTION
-
-/* Define if ept::debtags::Tag exists and has a fullname() method */
-#undef HAVE_EPT_DEBTAGS_TAG_FULLNAME
-
 /* Define if the ept debtags vocabulary object exists and supports facetData()
    */
 #undef HAVE_EPT_DEBTAGS_VOCABULARY_FACET_DATA
@@ -324,9 +303,6 @@
    */
 #undef HAVE_EPT_DEBTAGS_VOCABULARY_TAG_DATA
 
-/* Define if ept::textsearch exists */
-#undef HAVE_EPT_TEXTSEARCH
-
 /* Define if the execinfo file (for self-backtracing) is available */
 #undef HAVE_EXECINFO_H
 
diff --git a/configure b/configure
index f669c5f1..3ba14684 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for aptitude 0.6.8.
+# Generated by GNU Autoconf 2.69 for aptitude 0.6.9.
 #
 # Report bugs to <aptitude-devel@lists.alioth.debian.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='aptitude'
 PACKAGE_TARNAME='aptitude'
-PACKAGE_VERSION='0.6.8'
-PACKAGE_STRING='aptitude 0.6.8'
+PACKAGE_VERSION='0.6.9'
+PACKAGE_STRING='aptitude 0.6.9'
 PACKAGE_BUGREPORT='aptitude-devel@lists.alioth.debian.org'
 PACKAGE_URL=''
 
@@ -649,6 +649,8 @@ GTHREAD_LIBS
 GTHREAD_CFLAGS
 GLIBMM_LIBS
 GLIBMM_CFLAGS
+ept_LIBS
+ept_CFLAGS
 BUILD_LOCAL_GMOCK_FALSE
 BUILD_LOCAL_GMOCK_TRUE
 SQLITE3_LIBS
@@ -657,18 +659,17 @@ BOOST_UNIT_TEST_LIBS
 BOOST_IOSTREAMS_LIB
 BOOST_LDFLAGS
 BOOST_CPPFLAGS
-EGREP
-GREP
-CXXCPP
 CWIDGET_LIBS
 CWIDGET_CFLAGS
 SIGC_LIBS
 SIGC_CFLAGS
-ept_LIBS
-ept_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
+EGREP
+GREP
+CXXCPP
+XAPIAN_CONFIG
 HAVE_FOP_FALSE
 HAVE_FOP_TRUE
 HAVE_RSVG_CONVERT_FALSE
@@ -798,6 +799,7 @@ with_libiconv_prefix
 with_libintl_prefix
 with_boost
 with_boost_iostreams
+enable_ept
 enable_gtk
 enable_qt
 enable_private_glade_file
@@ -823,18 +825,18 @@ CPPFLAGS
 CXX
 CXXFLAGS
 CCC
+CXXCPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
-ept_CFLAGS
-ept_LIBS
 SIGC_CFLAGS
 SIGC_LIBS
 CWIDGET_CFLAGS
 CWIDGET_LIBS
-CXXCPP
 SQLITE3_CFLAGS
 SQLITE3_LIBS
+ept_CFLAGS
+ept_LIBS
 GLIBMM_CFLAGS
 GLIBMM_LIBS
 GTHREAD_CFLAGS
@@ -1389,7 +1391,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures aptitude 0.6.8 to adapt to many kinds of systems.
+\`configure' configures aptitude 0.6.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1459,7 +1461,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of aptitude 0.6.8:";;
+     short | recursive ) echo "Configuration of aptitude 0.6.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1471,6 +1473,7 @@ Optional Features:
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-rpath         do not hardcode runtime library paths
+  --enable-ept            enable use of ept library
   --enable-gtk            compile the GTK+ frontend
   --enable-qt             compile the Qt frontend
   --disable-private-glade-file
@@ -1524,24 +1527,24 @@ Some influential environment variables:
               you have headers in a nonstandard directory <include dir>
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
+  CXXCPP      C++ preprocessor
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
-  ept_CFLAGS  C compiler flags for ept, overriding pkg-config
-  ept_LIBS    linker flags for ept, overriding pkg-config
   SIGC_CFLAGS C compiler flags for SIGC, overriding pkg-config
   SIGC_LIBS   linker flags for SIGC, overriding pkg-config
   CWIDGET_CFLAGS
               C compiler flags for CWIDGET, overriding pkg-config
   CWIDGET_LIBS
               linker flags for CWIDGET, overriding pkg-config
-  CXXCPP      C++ preprocessor
   SQLITE3_CFLAGS
               C compiler flags for SQLITE3, overriding pkg-config
   SQLITE3_LIBS
               linker flags for SQLITE3, overriding pkg-config
+  ept_CFLAGS  C compiler flags for ept, overriding pkg-config
+  ept_LIBS    linker flags for ept, overriding pkg-config
   GLIBMM_CFLAGS
               C compiler flags for GLIBMM, overriding pkg-config
   GLIBMM_LIBS linker flags for GLIBMM, overriding pkg-config
@@ -1631,7 +1634,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-aptitude configure 0.6.8
+aptitude configure 0.6.9
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2195,7 +2198,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by aptitude $as_me 0.6.8, which was
+It was created by aptitude $as_me 0.6.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3011,7 +3014,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='aptitude'
- VERSION='0.6.8'
+ VERSION='0.6.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6843,126 +6846,6 @@ fi
 ac_cv_c_const=yes
 ac_cv_c_inline=yes
 
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7356,6 +7239,126 @@ fi
 done
 
 
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
 if test "x$enable_aptitude" != xno; then :
 
 
@@ -7520,448 +7523,68 @@ else
 fi
 
 
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ept" >&5
-$as_echo_n "checking for ept... " >&6; }
-
-if test -n "$ept_CFLAGS"; then
-    pkg_cv_ept_CFLAGS="$ept_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libept\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libept") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_ept_CFLAGS=`$PKG_CONFIG --cflags "libept" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$ept_LIBS"; then
-    pkg_cv_ept_LIBS="$ept_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libept\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libept") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_ept_LIBS=`$PKG_CONFIG --libs "libept" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        ept_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libept" 2>&1`
-        else
-	        ept_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libept" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$ept_PKG_ERRORS" >&5
-
-	as_fn_error $? "Can't find the ept library -- please install libept-dev" "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	as_fn_error $? "Can't find the ept library -- please install libept-dev" "$LINENO" 5
+# Extract the first word of "xapian-config", so it can be a program name with args.
+set dummy xapian-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XAPIAN_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-	ept_CFLAGS=$pkg_cv_ept_CFLAGS
-	ept_LIBS=$pkg_cv_ept_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-$as_echo "#define HAVE_EPT /**/" >>confdefs.h
-
-
-############################ CHECKS FOR EPT ############################
-
-OLD_CXXFLAGS="$CXXFLAGS"
-
-CXXFLAGS="$CXXFLAGS $ept_CFLAGS"
-
-DEBTAGS_OK=0
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ept::debtags::Tag exists" >&5
-$as_echo_n "checking whether ept::debtags::Tag exists... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <ept/debtags/tag.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Tag t;
-
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_EPT_DEBTAGS_TAG /**/" >>confdefs.h
-
-        DEBTAGS_OK=1
+  case $XAPIAN_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XAPIAN_CONFIG="$XAPIAN_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_XAPIAN_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
 
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ept::debtags::Facet exists" >&5
-$as_echo_n "checking whether ept::debtags::Facet exists... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <ept/debtags/tag.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Facet f;
-
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-
-$as_echo "#define HAVE_EPT_DEBTAGS_FACET /**/" >>confdefs.h
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
+XAPIAN_CONFIG=$ac_cv_path_XAPIAN_CONFIG
+if test -n "$XAPIAN_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XAPIAN_CONFIG" >&5
+$as_echo "$XAPIAN_CONFIG" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ept::debtags::getTagsOfItem returns a set of strings." >&5
-$as_echo_n "checking whether ept::debtags::getTagsOfItem returns a set of strings.... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <ept/debtags/debtags.h>
 
-int main(int argc, char **argv)
-{
-  // This would always crash, but we only care if it type-checks.
-  ept::debtags::Debtags DB;
-  std::set<std::string> result = DB.getTagsOfItem("foo");
 
-  return 0;
-}
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define EPT_DEBTAGS_GETTAGSOFITEM_RETURNS_STRINGS /**/" >>confdefs.h
-
-        DEBTAGS_OK=1
-
-else
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test x$DEBTAGS_OK = x0
+if test ! -x "$XAPIAN_CONFIG"
 then
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "Can't figure out how to access the ept debtags database.
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-TEXTSEARCH_OK=0
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ept::textsearch exists" >&5
-$as_echo_n "checking whether ept::textsearch exists... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <ept/textsearch/textsearch.h>
-
-int main(int argc, char **argv)
-{
-  ept::textsearch::TextSearch db;
-
-  db.docidByName("foo");
-
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_EPT_TEXTSEARCH /**/" >>confdefs.h
-
-        TEXTSEARCH_OK=1
-
-else
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ept/axi exists" >&5
-$as_echo_n "checking whether ept/axi exists... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <ept/axi/axi.h>
-
-int main(int argc, char **argv)
-{
-  Xapian::Database db(ept::axi::path_db());
-
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_EPT_AXI /**/" >>confdefs.h
-
-        TEXTSEARCH_OK=1
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test x$TEXTSEARCH_OK = x0
-then
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "Can't figure out how to access the ept Xapian database.
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ept::debtags::Vocabulary::tagData exists and returns ept::debtags::voc::TagData *" >&5
-$as_echo_n "checking whether ept::debtags::Vocabulary::tagData exists and returns ept::debtags::voc::TagData *... " >&6; }
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <ept/debtags/vocabulary.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Vocabulary vocabulary;
-  const ept::debtags::voc::TagData *td = vocabulary.tagData("foo");
-
-  // Use td so the compiler doesn't complain:
-  return td == NULL ? 1 : 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_EPT_DEBTAGS_VOCABULARY_TAG_DATA /**/" >>confdefs.h
-
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ept::debtags::Vocabulary::facetData exists and returns ept::debtags::voc::FacetData *" >&5
-$as_echo_n "checking whether ept::debtags::Vocabulary::facetData exists and returns ept::debtags::voc::FacetData *... " >&6; }
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <ept/debtags/vocabulary.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Vocabulary vocabulary;
-  const ept::debtags::voc::FacetData *fd = vocabulary.facetData("foo");
-
-  // Use fd so the compiler doesn't complain:
-  return fd == NULL ? 1 : 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_EPT_DEBTAGS_VOCABULARY_FACET_DATA /**/" >>confdefs.h
-
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ept::debtags::Tag::fullname() exists" >&5
-$as_echo_n "checking whether ept::debtags::Tag::fullname() exists... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <ept/debtags/tag.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Tag t;
-
-  std::string s = t.fullname();
-
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_EPT_DEBTAGS_TAG_FULLNAME /**/" >>confdefs.h
-
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  as_fn_error $? "Can't find xapian-config -- please install libxapian-dev" "$LINENO" 5
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
+XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
 
+OLD_CXXFLAGS="$CXXFLAGS"
+OLD_LIBS="$LIBS"
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ept::debtags::Facet exists and supports name()" >&5
-$as_echo_n "checking whether ept::debtags::Facet exists and supports name()... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <ept/debtags/tag.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Facet f;
-
-  const std::string name = f.name();
-
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_EPT_DEBTAGS_FACET_NAME /**/" >>confdefs.h
-
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ept::debtags::Facet exists and supports description retrieval" >&5
-$as_echo_n "checking whether ept::debtags::Facet exists and supports description retrieval... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <ept/debtags/tag.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Facet f;
-
-  const std::string longDesc = f.longDescription();
-  const std::string shortDesc = f.shortDescription();
-
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_EPT_DEBTAGS_FACET_DESCRIPTION /**/" >>confdefs.h
-
+CXXFLAGS="$CXXFLAGS $XAPIAN_CXXFLAGS"
+LIBS="$LIBS $XAPIAN_LIBS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "xapian.h" "ac_cv_header_xapian_h" "$ac_includes_default"
+if test "x$ac_cv_header_xapian_h" = xyes; then :
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  as_fn_error $? "Can't find the xapian headers -- please install libxapian-dev" "$LINENO" 5
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ept::debtags::Tag exists and supports description retrieval" >&5
-$as_echo_n "checking whether ept::debtags::Tag exists and supports description retrieval... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <ept/debtags/tag.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Tag t;
-
-  const std::string longDesc = t.longDescription();
-  const std::string shortDesc = t.shortDescription();
-
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
 
-$as_echo "#define HAVE_EPT_DEBTAGS_TAG_DESCRIPTION /**/" >>confdefs.h
-
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 CXXFLAGS="$OLD_CXXFLAGS"
+LIBS="$OLD_LIBS"
 
 ########################################################################
 
@@ -8865,6 +8488,218 @@ else
 fi
 
 
+########################################################################
+
+WANT_HAVE_EPT=0
+# Check whether --enable-ept was given.
+if test "${enable_ept+set}" = set; then :
+  enableval=$enable_ept; if test x$enableval = xyes
+	 then
+	     WANT_HAVE_EPT=1
+	 fi
+fi
+
+
+HAVE_EPT=0
+if test x$WANT_HAVE_EPT = x1 && test "x$enable_aptitude" != xno; then :
+  HAVE_EPT=1
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ept" >&5
+$as_echo_n "checking for ept... " >&6; }
+
+if test -n "$ept_CFLAGS"; then
+    pkg_cv_ept_CFLAGS="$ept_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libept\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libept") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_ept_CFLAGS=`$PKG_CONFIG --cflags "libept" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$ept_LIBS"; then
+    pkg_cv_ept_LIBS="$ept_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libept\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libept") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_ept_LIBS=`$PKG_CONFIG --libs "libept" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        ept_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libept" 2>&1`
+        else
+	        ept_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libept" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$ept_PKG_ERRORS" >&5
+
+	as_fn_error $? "Can't find the ept library -- please install libept-dev" "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	as_fn_error $? "Can't find the ept library -- please install libept-dev" "$LINENO" 5
+else
+	ept_CFLAGS=$pkg_cv_ept_CFLAGS
+	ept_LIBS=$pkg_cv_ept_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+   OLD_CXXFLAGS="$CXXFLAGS"
+
+   CXXFLAGS="$CXXFLAGS $ept_CFLAGS"
+
+   DEBTAGS_OK=0
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ept::debtags::getTagsOfItem returns a set of strings." >&5
+$as_echo_n "checking whether ept::debtags::getTagsOfItem returns a set of strings.... " >&6; }
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <ept/debtags/debtags.h>
+
+int main(int argc, char **argv)
+{
+  // This would always crash, but we only care if it type-checks.
+  ept::debtags::Debtags DB;
+  std::set<std::string> result = DB.getTagsOfItem("foo");
+
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define EPT_DEBTAGS_GETTAGSOFITEM_RETURNS_STRINGS /**/" >>confdefs.h
+
+        DEBTAGS_OK=1
+
+else
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    if test x$DEBTAGS_OK = x0
+    then
+      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Can't figure out how to access the ept debtags database.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ept::debtags::Vocabulary::tagData exists and returns ept::debtags::voc::TagData *" >&5
+$as_echo_n "checking whether ept::debtags::Vocabulary::tagData exists and returns ept::debtags::voc::TagData *... " >&6; }
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <ept/debtags/vocabulary.h>
+
+int main(int argc, char **argv)
+{
+  ept::debtags::Vocabulary vocabulary;
+  const ept::debtags::voc::TagData *td = vocabulary.tagData("foo");
+
+  // Use td so the compiler doesn't complain:
+  return td == NULL ? 1 : 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_EPT_DEBTAGS_VOCABULARY_TAG_DATA /**/" >>confdefs.h
+
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ept::debtags::Vocabulary::facetData exists and returns ept::debtags::voc::FacetData *" >&5
+$as_echo_n "checking whether ept::debtags::Vocabulary::facetData exists and returns ept::debtags::voc::FacetData *... " >&6; }
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <ept/debtags/vocabulary.h>
+
+int main(int argc, char **argv)
+{
+  ept::debtags::Vocabulary vocabulary;
+  const ept::debtags::voc::FacetData *fd = vocabulary.facetData("foo");
+
+  // Use fd so the compiler doesn't complain:
+  return fd == NULL ? 1 : 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_EPT_DEBTAGS_VOCABULARY_FACET_DATA /**/" >>confdefs.h
+
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+   CXXFLAGS="$OLD_CXXFLAGS"
+
+elif test "x$enable_aptitude" != xno; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: The ept library is not being used; use --enable-ept to enable it." >&5
+$as_echo "$as_me: The ept library is not being used; use --enable-ept to enable it." >&6;}
+fi
+
+if test x$HAVE_EPT = x1
+then
+
+$as_echo "#define HAVE_EPT /**/" >>confdefs.h
+
+fi
+
+########################################################################
+
 WANT_HAVE_GTK=0
 # Check whether --enable-gtk was given.
 if test "${enable_gtk+set}" = set; then :
@@ -9270,8 +9105,8 @@ $as_echo "#define HAVE_GTK /**/" >>confdefs.h
 
 fi
 
-CXXFLAGS="$CXXFLAGS $SIGC_CFLAGS $CWIDGET_CFLAGS $ept_CFLAGS $SQLITE3_CFLAGS"
-LIBS="$LIBS $SIGC_LIBS $CWIDGET_LIBS $ept_LIBS $SQLITE3_LIBS $BOOST_IOSTREAMS_LIB"
+CXXFLAGS="$CXXFLAGS $SIGC_CFLAGS $CWIDGET_CFLAGS $ept_CFLAGS $SQLITE3_CFLAGS $XAPIAN_CXXFLAGS"
+LIBS="$LIBS $SIGC_LIBS $CWIDGET_LIBS $ept_LIBS $SQLITE3_LIBS $BOOST_IOSTREAMS_LIB $XAPIAN_LIBS"
 CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
 LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
 
@@ -10700,7 +10535,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by aptitude $as_me 0.6.8, which was
+This file was extended by aptitude $as_me 0.6.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10766,7 +10601,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-aptitude config.status 0.6.8
+aptitude config.status 0.6.9
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 9ab21981..705cf2f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([aptitude], [0.6.8], [aptitude-devel@lists.alioth.debian.org])
+AC_INIT([aptitude], [0.6.9], [aptitude-devel@lists.alioth.debian.org])
 AC_CONFIG_SRCDIR([src/main.cc])
 AM_INIT_AUTOMAKE([dist-xz no-dist-gzip -Wno-portability])
 AM_CONFIG_HEADER(config.h)
@@ -51,244 +51,23 @@ AC_CHECK_LIB(pthread, main,
 	HAVE_LIBPTHREAD=1
 	, [AC_MSG_ERROR([Can't find the POSIX thread libraries])])
 
-PKG_CHECK_MODULES(ept, libept, [], [AC_MSG_ERROR([Can't find the ept library -- please install libept-dev])])
-AC_DEFINE([HAVE_EPT], [], [Backwards compatibility symbol; must always be defined.])
-
-############################ CHECKS FOR EPT ############################
-
-OLD_CXXFLAGS="$CXXFLAGS"
-
-CXXFLAGS="$CXXFLAGS $ept_CFLAGS"
-
-dnl Newer versions of libept use strings instead of various old ept
-dnl data structures.  Test for each one individually.
-DEBTAGS_OK=0
-
-AC_MSG_CHECKING([whether ept::debtags::Tag exists])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <ept/debtags/tag.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Tag t;
-
-  return 0;
-}])],
-        [
-        AC_MSG_RESULT(yes)
-        AC_DEFINE([HAVE_EPT_DEBTAGS_TAG], [], [Define if ept::debtags::Tag exists.])
-        DEBTAGS_OK=1
-        ],
-        [AC_MSG_RESULT(no)])
-
-AC_MSG_CHECKING([whether ept::debtags::Facet exists])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <ept/debtags/tag.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Facet f;
-
-  return 0;
-}])],
-        [
-        AC_DEFINE([HAVE_EPT_DEBTAGS_FACET], [], [Define if ept::debtags::Facet exists])
-        AC_MSG_RESULT([yes])
-        ],
-        [AC_MSG_RESULT([no])])
-
-AC_MSG_CHECKING([whether ept::debtags::getTagsOfItem returns a set of strings.])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <ept/debtags/debtags.h>
-
-int main(int argc, char **argv)
-{
-  // This would always crash, but we only care if it type-checks.
-  ept::debtags::Debtags DB;
-  std::set<std::string> result = DB.getTagsOfItem("foo");
-
-  return 0;
-}
-])],
-        [
-        AC_MSG_RESULT(yes)
-        AC_DEFINE([EPT_DEBTAGS_GETTAGSOFITEM_RETURNS_STRINGS], [], [Define if ept::debtags::Debtags::getTagsOfItem returns a set of strings])
-        DEBTAGS_OK=1
-        ],
-        [
-        AC_MSG_RESULT(no)
-        ])
-
-if test x$DEBTAGS_OK = x0
-then
-  AC_MSG_FAILURE([Can't figure out how to access the ept debtags database.])
-fi
-
-TEXTSEARCH_OK=0
-
-dnl Newer versions of ept got rid of the whole textsearch header and
-dnl instead just include the Xapian database directly.  See which
-dnl version we're dealing with.
-AC_MSG_CHECKING([whether ept::textsearch exists])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <ept/textsearch/textsearch.h>
-
-int main(int argc, char **argv)
-{
-  ept::textsearch::TextSearch db;
-
-  db.docidByName("foo");
-
-  return 0;
-}])],
-        [
-        AC_MSG_RESULT(yes)
-        AC_DEFINE([HAVE_EPT_TEXTSEARCH], [], [Define if ept::textsearch exists])
-        TEXTSEARCH_OK=1
-        ],
-        [
-        AC_MSG_RESULT(no)
-        ])
-
-dnl Now look in the new location:
-AC_MSG_CHECKING([whether ept/axi exists])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <ept/axi/axi.h>
-
-int main(int argc, char **argv)
-{
-  Xapian::Database db(ept::axi::path_db());
-
-  return 0;
-}])],
-        [
-        AC_MSG_RESULT([yes])
-        AC_DEFINE([HAVE_EPT_AXI], [], [Define if ept/axi/axi.h can provide docids.])
-        TEXTSEARCH_OK=1
-        ],
-        [AC_MSG_RESULT([no])])
-
-if test x$TEXTSEARCH_OK = x0
+AC_PATH_PROG(XAPIAN_CONFIG, xapian-config)
+if test ! -x "$XAPIAN_CONFIG"
 then
-  AC_MSG_FAILURE([Can't figure out how to access the ept Xapian database.])
+  AC_MSG_ERROR([Can't find xapian-config -- please install libxapian-dev])
 fi
+XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
+XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
 
-AC_MSG_CHECKING([whether ept::debtags::Vocabulary::tagData exists and returns ept::debtags::voc::TagData *])
-
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <ept/debtags/vocabulary.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Vocabulary vocabulary;
-  const ept::debtags::voc::TagData *td = vocabulary.tagData("foo");
-
-  // Use td so the compiler doesn't complain:
-  return td == NULL ? 1 : 0;
-}])],
-        [
-        AC_MSG_RESULT([yes])
-        AC_DEFINE([HAVE_EPT_DEBTAGS_VOCABULARY_TAG_DATA], [], [Define if the ept debtags vocabulary object exists and supports tagData()])
-        ],
-        [AC_MSG_RESULT([no])])
-
-
-AC_MSG_CHECKING([whether ept::debtags::Vocabulary::facetData exists and returns ept::debtags::voc::FacetData *])
-
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <ept/debtags/vocabulary.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Vocabulary vocabulary;
-  const ept::debtags::voc::FacetData *fd = vocabulary.facetData("foo");
-
-  // Use fd so the compiler doesn't complain:
-  return fd == NULL ? 1 : 0;
-}])],
-        [
-        AC_MSG_RESULT([yes])
-        AC_DEFINE([HAVE_EPT_DEBTAGS_VOCABULARY_FACET_DATA], [], [Define if the ept debtags vocabulary object exists and supports facetData()])
-        ],
-        [AC_MSG_RESULT([no])])
-
-AC_MSG_CHECKING([whether ept::debtags::Tag::fullname() exists])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <ept/debtags/tag.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Tag t;
-
-  std::string s = t.fullname();
-
-  return 0;
-}])],
-        [
-        AC_MSG_RESULT([yes])
-        AC_DEFINE([HAVE_EPT_DEBTAGS_TAG_FULLNAME], [], [Define if ept::debtags::Tag exists and has a fullname() method])
-        ],
-        [AC_MSG_RESULT([no])])
-
-
-AC_MSG_CHECKING([whether ept::debtags::Facet exists and supports name()])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <ept/debtags/tag.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Facet f;
-
-  const std::string name = f.name();
-
-  return 0;
-}])],
-        [
-        AC_MSG_RESULT([yes])
-        AC_DEFINE([HAVE_EPT_DEBTAGS_FACET_NAME], [], [Define if ept::debtags::Facet exists and supports description retrieval.])
-        ],
-        [AC_MSG_RESULT([no])])
-
-
-AC_MSG_CHECKING([whether ept::debtags::Facet exists and supports description retrieval])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <ept/debtags/tag.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Facet f;
-
-  const std::string longDesc = f.longDescription();
-  const std::string shortDesc = f.shortDescription();
-
-  return 0;
-}])],
-        [
-        AC_MSG_RESULT([yes])
-        AC_DEFINE([HAVE_EPT_DEBTAGS_FACET_DESCRIPTION], [], [Define if ept::debtags::Facet exists and supports description retrieval.])
-        ],
-        [AC_MSG_RESULT([no])])
-
-AC_MSG_CHECKING([whether ept::debtags::Tag exists and supports description retrieval])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <ept/debtags/tag.h>
-
-int main(int argc, char **argv)
-{
-  ept::debtags::Tag t;
-
-  const std::string longDesc = t.longDescription();
-  const std::string shortDesc = t.shortDescription();
-
-  return 0;
-}])],
-        [
-        AC_MSG_RESULT([yes])
-        AC_DEFINE([HAVE_EPT_DEBTAGS_TAG_DESCRIPTION], [], [Define if ept::debtags::Tag exists and supports description retrieval.])
-        ],
-        [AC_MSG_RESULT([no])])
+OLD_CXXFLAGS="$CXXFLAGS"
+OLD_LIBS="$LIBS"
 
+CXXFLAGS="$CXXFLAGS $XAPIAN_CXXFLAGS"
+LIBS="$LIBS $XAPIAN_LIBS"
+AC_CHECK_HEADER([xapian.h], [],
+    [AC_MSG_ERROR([Can't find the xapian headers -- please install libxapian-dev])])
 CXXFLAGS="$OLD_CXXFLAGS"
+LIBS="$OLD_LIBS"
 
 ########################################################################
 
@@ -543,6 +322,107 @@ PKG_CHECK_MODULES(SQLITE3, sqlite3)
 
 AM_CONDITIONAL([BUILD_LOCAL_GMOCK], [test x$BUILD_LOCAL_GMOCK = x1])
 
+########################################################################
+
+WANT_HAVE_EPT=0
+AC_ARG_ENABLE(ept,
+	AS_HELP_STRING(--enable-ept, [enable use of ept library]),
+	[if test x$enableval = xyes
+	 then
+	     WANT_HAVE_EPT=1
+	 fi])
+
+HAVE_EPT=0
+AS_IF(
+  [test x$WANT_HAVE_EPT = x1 && test "x$enable_aptitude" != xno],
+  [HAVE_EPT=1
+   PKG_CHECK_MODULES([ept], [libept], [],
+     [AC_MSG_ERROR([Can't find the ept library -- please install libept-dev])])
+
+   OLD_CXXFLAGS="$CXXFLAGS"
+
+   CXXFLAGS="$CXXFLAGS $ept_CFLAGS"
+
+   DEBTAGS_OK=0
+
+   AC_MSG_CHECKING([whether ept::debtags::getTagsOfItem returns a set of strings.])
+   AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+#include <ept/debtags/debtags.h>
+
+int main(int argc, char **argv)
+{
+  // This would always crash, but we only care if it type-checks.
+  ept::debtags::Debtags DB;
+  std::set<std::string> result = DB.getTagsOfItem("foo");
+
+  return 0;
+}])],
+        [
+        AC_MSG_RESULT(yes)
+        AC_DEFINE([EPT_DEBTAGS_GETTAGSOFITEM_RETURNS_STRINGS], [],
+            [Define if ept::debtags::Debtags::getTagsOfItem returns a set of strings])
+        DEBTAGS_OK=1
+        ],
+        [
+        AC_MSG_RESULT(no)
+        ])
+
+    if test x$DEBTAGS_OK = x0
+    then
+      AC_MSG_FAILURE([Can't figure out how to access the ept debtags database.])
+    fi
+
+    AC_MSG_CHECKING([whether ept::debtags::Vocabulary::tagData exists and returns ept::debtags::voc::TagData *])
+
+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+#include <ept/debtags/vocabulary.h>
+
+int main(int argc, char **argv)
+{
+  ept::debtags::Vocabulary vocabulary;
+  const ept::debtags::voc::TagData *td = vocabulary.tagData("foo");
+
+  // Use td so the compiler doesn't complain:
+  return td == NULL ? 1 : 0;
+}])],
+        [
+        AC_MSG_RESULT([yes])
+        AC_DEFINE([HAVE_EPT_DEBTAGS_VOCABULARY_TAG_DATA], [], [Define if the ept debtags vocabulary object exists and supports tagData()])
+        ],
+        [AC_MSG_RESULT([no])])
+
+    AC_MSG_CHECKING([whether ept::debtags::Vocabulary::facetData exists and returns ept::debtags::voc::FacetData *])
+
+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+#include <ept/debtags/vocabulary.h>
+
+int main(int argc, char **argv)
+{
+  ept::debtags::Vocabulary vocabulary;
+  const ept::debtags::voc::FacetData *fd = vocabulary.facetData("foo");
+
+  // Use fd so the compiler doesn't complain:
+  return fd == NULL ? 1 : 0;
+}])],
+        [
+        AC_MSG_RESULT([yes])
+        AC_DEFINE([HAVE_EPT_DEBTAGS_VOCABULARY_FACET_DATA], [], [Define if the ept debtags vocabulary object exists and supports facetData()])
+        ],
+        [AC_MSG_RESULT([no])])
+
+   CXXFLAGS="$OLD_CXXFLAGS"
+  ],
+
+  [test "x$enable_aptitude" != xno],
+  [AC_MSG_NOTICE([The ept library is not being used; use --enable-ept to enable it.])])
+
+if test x$HAVE_EPT = x1
+then
+  AC_DEFINE([HAVE_EPT], [], [Define if the ept library is to be used.])
+fi
+
+########################################################################
+
 WANT_HAVE_GTK=0
 AC_ARG_ENABLE(gtk,
 	AS_HELP_STRING(--enable-gtk, [compile the GTK+ frontend]),
@@ -585,8 +465,8 @@ then
   AC_DEFINE([HAVE_GTK], [], [Define if the GTK+ frontend is included in the build.])
 fi
 
-CXXFLAGS="$CXXFLAGS $SIGC_CFLAGS $CWIDGET_CFLAGS $ept_CFLAGS $SQLITE3_CFLAGS"
-LIBS="$LIBS $SIGC_LIBS $CWIDGET_LIBS $ept_LIBS $SQLITE3_LIBS $BOOST_IOSTREAMS_LIB"
+CXXFLAGS="$CXXFLAGS $SIGC_CFLAGS $CWIDGET_CFLAGS $ept_CFLAGS $SQLITE3_CFLAGS $XAPIAN_CXXFLAGS"
+LIBS="$LIBS $SIGC_LIBS $CWIDGET_LIBS $ept_LIBS $SQLITE3_LIBS $BOOST_IOSTREAMS_LIB $XAPIAN_LIBS"
 CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
 LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d87b9bb8..f6b73ea9 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -209,6 +209,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/cs/Makefile.in b/doc/cs/Makefile.in
index deac52d3..f35b74c3 100644
--- a/doc/cs/Makefile.in
+++ b/doc/cs/Makefile.in
@@ -252,6 +252,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/cs/images/Makefile.in b/doc/cs/images/Makefile.in
index 6b44286d..e72ccb44 100644
--- a/doc/cs/images/Makefile.in
+++ b/doc/cs/images/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/de/Makefile.in b/doc/de/Makefile.in
index c5f4f55f..d378ab32 100644
--- a/doc/de/Makefile.in
+++ b/doc/de/Makefile.in
@@ -256,6 +256,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/en/Makefile.in b/doc/en/Makefile.in
index d46e4ebd..5c5ce8ad 100644
--- a/doc/en/Makefile.in
+++ b/doc/en/Makefile.in
@@ -253,6 +253,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/en/aptitude.xml b/doc/en/aptitude.xml
index 749e8101..4f448720 100644
--- a/doc/en/aptitude.xml
+++ b/doc/en/aptitude.xml
@@ -7,7 +7,7 @@
   <!ENTITY dselect '<command>dselect</command>'>
   <!ENTITY apt-get '<command>apt-get</command>'>
   <!ENTITY root '<systemitem class="username">root</systemitem>'>
-  <!ENTITY VERSION '0.6.8'>
+  <!ENTITY VERSION '0.6.9'>
 
   <!-- Shortcuts for menu commands: -->
 
@@ -6212,6 +6212,18 @@ e: Examine  !: Apply  .: Next  ,: Previous</screen>
 	      special values <literal>native</literal> and
 	      <literal>foreign</literal>.
 	    </para>
+
+            <para>
+              The value of <replaceable>architecture</replaceable> can
+              also be an architecture specification string as defined
+              in Debian Policy § 11.1 <quote>Architecture
+              specification strings</quote>.  These are strings of the
+              form <quote><replaceable>os</replaceable>-<replaceable>arch</replaceable></quote>,
+              where either component can be the wildcard
+              <quote><literal>any</literal></quote>.  For example,
+              <quote><literal>any-i386</literal></quote> or
+              <quote><literal>linux-any</literal></quote>.
+            </para>
 	  </listitem>
 	</varlistentry>
 
@@ -10804,6 +10816,21 @@ e: Examine  !: Apply  .: Next  ,: Previous</screen>
 	      </seg>
 	    </seglistitem>
 
+	    <seglistitem id='configCmdLine-Fix-Missing'>
+	      <seg><literal>Aptitude::CmdLine::Fix-Missing</literal></seg>
+	      <seg><literal>false</literal></seg>
+	      <seg>
+                In command-line mode, if a package is unavailable of
+                fails to download to correctly and this option is
+                <literal>true</literal>, &aptitude; will try to
+                continue installing other packages without it.  The
+                package will still be marked for later installation,
+                as though <literal>--schedule-only</literal> had been
+                used.  Command-line Option: <literal><link
+                linkend='cmdlineOptionFixMissing'>--fix-missing</link></literal>.
+              </seg>
+            </seglistitem>
+
             <seglistitem id='configCmdLine-Versions-Group-By'>
               <seg><literal>Aptitude::CmdLine::Versions-Group-By</literal></seg>
 
@@ -11003,6 +11030,25 @@ e: Examine  !: Apply  .: Next  ,: Previous</screen>
 	      </seg>
 	    </seglistitem>
 
+            <seglistitem id='configCmdLine-Sorting'>
+              <seg><literal>Aptitude::CmdLine::Sorting</literal></seg>
+              <seg><literal>name,version</literal></seg>
+              <seg>
+                Specify the order in which output from the <link
+                linkend='cmdlineSearch'><literal>search</literal></link>
+                and <link
+                linkend='cmdlineVersions'><literal>versions</literal></link>
+                commands should be displayed.  For instance, passing
+                <quote><literal>installsize</literal></quote> for
+                <replaceable>order</replaceable> will list packages in
+                order according to their size when installed (see the
+                section <quote><link
+                linkend='secSortingPolicy'>Customizing how packages
+                are sorted</link></quote> in the &aptitude; reference
+                manual for more information).
+              </seg>
+            </seglistitem>
+
 	    <seglistitem id='configCmdLine-Version-Display-Format'>
 	      <seg><literal>Aptitude::CmdLine::Version-Display-Format</literal></seg>
 	      <seg><literal>%c%a%M %p# %t %i</literal></seg>
diff --git a/doc/en/images/Makefile.in b/doc/en/images/Makefile.in
index de3ed900..ae39cae6 100644
--- a/doc/en/images/Makefile.in
+++ b/doc/en/images/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/en/manpage.xml b/doc/en/manpage.xml
index 306640f5..c6933eb6 100644
--- a/doc/en/manpage.xml
+++ b/doc/en/manpage.xml
@@ -1533,6 +1533,33 @@ libdbix-fulltextsearch-perl 0.73-10</screen>
 	</listitem>
       </varlistentry>
 
+      <varlistentry id='cmdlineOptionFixMissing'>
+	<term>
+          <literal>-m</literal>, <literal>--ignore-missing</literal>,
+          <literal>--fix-missing</literal>
+        </term>
+
+	<listitem>
+	  <para>
+            If a package is unavailable or fails to download correctly
+            try to continue installing packages without it.  The
+            package will still be marked for later installation, as
+            though <literal>--schedule-only</literal> had been used.
+            Configuration Item: <literal><link
+            linkend='configCmdLine-Fix-Missing'>Aptitude::CmdLine::Fix-Missing</link></literal>.
+	  </para>
+
+          <note>
+            <para>
+              This was the default behaviour in previous versions of
+              &aptitude; however it caused problems when trying to
+              detect errors using the exit status and was prone to
+              resulting in undesired effects.
+            </para>
+          </note>
+	</listitem>
+      </varlistentry>
+
       <varlistentry id='cmdlineOptionNoNewInstalls'>
 	<term>
 	  <literal>--no-new-installs</literal>
@@ -1604,6 +1631,11 @@ libdbix-fulltextsearch-perl 0.73-10</screen>
           <para>
             The default sort order is <literal>name,version</literal>.
           </para>
+
+          <para>
+            Configuration Item: <literal><link
+            linkend='configCmdLine-Sorting'>Aptitude::CmdLine::Sorting</link></literal>
+          </para>
 	</listitem>
       </varlistentry>
 
@@ -2064,7 +2096,11 @@ Packages requiring libglib2.0-data:
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-t</literal> <replaceable>release</replaceable>, <literal>--target-release</literal> <replaceable>release</replaceable></term>
+	<term>
+          <literal>-t</literal> <replaceable>release</replaceable>,
+          <literal>--target-release</literal> <replaceable>release</replaceable>,
+          <literal>--default-release</literal> <replaceable>release</replaceable>
+        </term>
 
 	<listitem>
 	  <para>
@@ -2204,7 +2240,10 @@ The following packages will be REMOVED:
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-y</literal>, <literal>--assume-yes</literal></term>
+	<term>
+          <literal>-y</literal>, <literal>--yes</literal>,
+          <literal>--assume-yes</literal>
+        </term>
 
 	<listitem>
 	  <para>
@@ -2257,7 +2296,7 @@ The following packages will be REMOVED:
 	    <menuchoice><guimenu>Actions</guimenu><guimenuitem>Clean
 	    obsolete files</guimenuitem></menuchoice>).  You cannot
 	    use this option and
-	    <quote><literal>--autoclean-on-startup</literal></quote>,
+	    <quote><literal>--clean-on-startup</literal></quote>,
 	    <quote><literal>-i</literal></quote>, or
 	    <quote><literal>-u</literal></quote> at the same time.
 	  </para>
@@ -2283,7 +2322,7 @@ The following packages will be REMOVED:
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-i</literal></term>
+	<term><literal>-i</literal>, <literal>--install-on-startup</literal></term>
 
 	<listitem>
 	  <para>
@@ -2310,7 +2349,7 @@ The following packages will be REMOVED:
       </varlistentry>
 
       <varlistentry>
-	<term><literal>-u</literal></term>
+	<term><literal>-u</literal>, <literal>--update-on-startup</literal></term>
 
 	<listitem>
 	  <para>
@@ -2326,6 +2365,53 @@ The following packages will be REMOVED:
   </refsect1>
 
   <refsect1>
+    <title>Exit Status</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><literal>0</literal></term>
+
+        <listitem>
+          <para>Success.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><literal>1</literal></term>
+
+        <listitem>
+          <para>User aborted or no matches.</para>
+
+          <para>
+            For most commands this means that the user aborted the
+            operation before it was completed.
+          </para>
+
+          <para>
+            For the <command>search</command>,
+            <command>versions</command>, <command>why</command>, and
+            <command>why-not</command> commands this indicates that
+            no matches were found.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><literal>100</literal></term>
+
+        <listitem>
+          <para>Failure.</para>
+
+          <para>
+            There was an error and some or all of the requested
+            actions could not be performed.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
+  <refsect1>
     <title>Environment</title>
 
     <variablelist>
diff --git a/doc/es/Makefile.in b/doc/es/Makefile.in
index 007ba8e6..23d0d119 100644
--- a/doc/es/Makefile.in
+++ b/doc/es/Makefile.in
@@ -257,6 +257,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/es/images/Makefile.in b/doc/es/images/Makefile.in
index 3112022c..766df880 100644
--- a/doc/es/images/Makefile.in
+++ b/doc/es/images/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/fi/Makefile.in b/doc/fi/Makefile.in
index f9f0b9c3..e1529fd9 100644
--- a/doc/fi/Makefile.in
+++ b/doc/fi/Makefile.in
@@ -252,6 +252,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/fi/images/Makefile.in b/doc/fi/images/Makefile.in
index bfaa302f..f864fbd1 100644
--- a/doc/fi/images/Makefile.in
+++ b/doc/fi/images/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/fr/Makefile.in b/doc/fr/Makefile.in
index a56ceb0a..fe715e7d 100644
--- a/doc/fr/Makefile.in
+++ b/doc/fr/Makefile.in
@@ -256,6 +256,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/fr/images/Makefile.in b/doc/fr/images/Makefile.in
index 4b3fc931..6f0d2e63 100644
--- a/doc/fr/images/Makefile.in
+++ b/doc/fr/images/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/it/Makefile.in b/doc/it/Makefile.in
index 32589a36..3d500796 100644
--- a/doc/it/Makefile.in
+++ b/doc/it/Makefile.in
@@ -257,6 +257,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/it/images/Makefile.in b/doc/it/images/Makefile.in
index c4902d6f..317fc897 100644
--- a/doc/it/images/Makefile.in
+++ b/doc/it/images/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/ja/Makefile.in b/doc/ja/Makefile.in
index f2be81ac..e08cfb70 100644
--- a/doc/ja/Makefile.in
+++ b/doc/ja/Makefile.in
@@ -256,6 +256,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/ja/images/Makefile.in b/doc/ja/images/Makefile.in
index 4284c0b0..dadfd070 100644
--- a/doc/ja/images/Makefile.in
+++ b/doc/ja/images/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/pl/Makefile.in b/doc/pl/Makefile.in
index 5e819f63..51e0943c 100644
--- a/doc/pl/Makefile.in
+++ b/doc/pl/Makefile.in
@@ -256,6 +256,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/po4a/Makefile.in b/doc/po4a/Makefile.in
index 9db10290..2ee4797a 100644
--- a/doc/po4a/Makefile.in
+++ b/doc/po4a/Makefile.in
@@ -209,6 +209,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/po4a/add_de/Makefile.in b/doc/po4a/add_de/Makefile.in
index b512646d..5332af52 100644
--- a/doc/po4a/add_de/Makefile.in
+++ b/doc/po4a/add_de/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/po4a/add_es/Makefile.in b/doc/po4a/add_es/Makefile.in
index b43d927f..7572c574 100644
--- a/doc/po4a/add_es/Makefile.in
+++ b/doc/po4a/add_es/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/po4a/add_fr/Makefile.in b/doc/po4a/add_fr/Makefile.in
index 8897968e..502745e9 100644
--- a/doc/po4a/add_fr/Makefile.in
+++ b/doc/po4a/add_fr/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/po4a/add_pl/Makefile.in b/doc/po4a/add_pl/Makefile.in
index 7d8e0ac4..52fa679a 100644
--- a/doc/po4a/add_pl/Makefile.in
+++ b/doc/po4a/add_pl/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/po4a/po/Makefile.in b/doc/po4a/po/Makefile.in
index 7f0c7497..03696add 100644
--- a/doc/po4a/po/Makefile.in
+++ b/doc/po4a/po/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/doc/po4a/po/pl.po b/doc/po4a/po/pl.po
index 8036070a..659c79bc 100644
--- a/doc/po4a/po/pl.po
+++ b/doc/po4a/po/pl.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: aptitude 0.6.3\n"
 "Report-Msgid-Bugs-To: aptitude-devel@lists.alioth.debian.org\n"
 "POT-Creation-Date: 2012-06-03 10:50+0800\n"
-"PO-Revision-Date: 2012-02-13 20:17+0100\n"
+"PO-Revision-Date: 2012-06-08 15:40+0200\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
 "Language: pl\n"
@@ -6516,11 +6516,6 @@ msgstr "Instaluje <replaceable>pakiet</replaceable>."
 #. type: Content of: <book><chapter><section><section><table><tgroup><tbody><row><entry>
 #: en/aptitude.xml:5568
 #, fuzzy
-#| msgid ""
-#| "<literal>archive</literal> to group packages by the archive they occur in "
-#| "(<quote><literal>stable</literal></quote>, <quote><literal>unstable</"
-#| "literal></quote>, etc).  If a package occurs in several archives, it will "
-#| "be displayed in each of them."
 msgid ""
 "Select packages for the given architecture (such as <quote><literal>amd64</"
 "literal></quote>, or <quote><literal>all</literal></quote>).  Special "
@@ -16926,9 +16921,8 @@ msgstr ""
 
 #. type: Content of: <book><reference><title>
 #: en/aptitude.xml:13210
-#, fuzzy
 msgid "Command-line reference"
-msgstr "Wiersz poleceń"
+msgstr "Opis wiersza poleceń"
 
 #. type: Content of: <refentry><refnamediv><refname>
 #: en/manpage.xml:17 en/manpage.xml:54 en/manpage.xml:59
@@ -17508,13 +17502,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: en/manpage.xml:459
-#, fuzzy
-#| msgid ""
-#| "This command is useful for avoiding broken versions of packages without "
-#| "having to set and clear manual holds.  If you decide you really want the "
-#| "forbidden version after all, <quote><literal>install package...</"
-#| "literal></quote> will remove the ban. <literal>--schedule-only</literal> "
-#| "here can be used to just remove the ban without installing anything."
 msgid ""
 "This command is useful for avoiding broken versions of packages without "
 "having to set and clear manual holds.  If you decide you really want the "
@@ -17524,9 +17511,8 @@ msgstr ""
 "To polecenie jest użyteczne do unikania uszkodzonych wersji pakietów, bez "
 "potrzeby ręcznego ustawiania i usuwania statusu zatrzymania. Jeśli jednak "
 "zaistnieje potrzeba zainstalowania zabronionej wersji, polecenie "
-"<quote><literal>install</literal></quote> usunie ten zakaz. Opcja <literal>--"
-"schedule-only</literal> może być użyta do usunięcia zakazu, bez instalowania "
-"czegokolwiek."
+"<quote><literal>aptitude install <replaceable>pakiet</replaceable></"
+"literal></quote> usunie ten zakaz."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: en/manpage.xml:469
@@ -18598,15 +18584,6 @@ msgstr "<literal>--disable-columns</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: en/manpage.xml:1194
-#, fuzzy
-#| msgid ""
-#| "This option causes <literal>aptitude search</literal> and "
-#| "<literal>aptitude version</literal> to output their results without any "
-#| "special formatting.  In particular: normally &aptitude; will add "
-#| "whitespace or truncate search results in an attempt to fit its results "
-#| "into vertical <quote>columns</quote>.  With this flag, each line will be "
-#| "formed by replacing any format escapes in the format string with the "
-#| "corresponding text; column widths will be ignored."
 msgid ""
 "This option causes <literal>aptitude search</literal> and <literal>aptitude "
 "versions</literal> to output their results without any special formatting.  "
@@ -18617,7 +18594,7 @@ msgid ""
 "be ignored."
 msgstr ""
 "Opcja nakazuje poleceniom <literal>aptitude search</literal> i "
-"<literal>aptitude version</literal> wyświetlać wyniki bez specjalnego "
+"<literal>aptitude versions</literal> wyświetlać wyniki bez specjalnego "
 "formatowania. W szczególności: zwykle &aptitude; dodaje białe znaki lub "
 "ucina wyniki, próbując wpasować wyniki wyszukiwania w <quote>kolumny</"
 "quote>. Z tą flagą, każdy wiersz będzie wypisywany przez zastąpienie znaków "
@@ -18741,16 +18718,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: en/manpage.xml:1275
-#, fuzzy
-#| msgid ""
-#| "Specify the format which should be used to display output from the "
-#| "<literal>search</literal> and <literal>version</literal> commands.  For "
-#| "instance, passing <quote><literal>%p %V %v</literal></quote> for "
-#| "<replaceable>format</replaceable> will display a package's name, followed "
-#| "by its currently installed version and its available version (see the "
-#| "section <quote><link linkend='secDisplayFormat'>Customizing how packages "
-#| "are displayed</link></quote> in the &aptitude; reference manual for more "
-#| "information)."
 msgid ""
 "Specify the format which should be used to display output from the "
 "<literal>search</literal> and <literal>versions</literal> commands.  For "
@@ -18762,7 +18729,7 @@ msgid ""
 "information)."
 msgstr ""
 "Określa format, który powinien być użyty do wyświetlenia wyniku poleceń "
-"<literal>search</literal> i <literal>version</literal>. Dla przykładu, "
+"<literal>search</literal> i <literal>versions</literal>. Dla przykładu, "
 "wpisanie <quote><literal>%p %V %v</literal></quote> dla <replaceable>format</"
 "replaceable>u wyświetli kolejno: nazwę pakietu, aktualnie zainstalowaną "
 "wersję i dostępne wersje (proszę zapoznać się z rozdziałem <quote><link "
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 036a3121..d74814a3 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/po/aptitude.pot b/po/aptitude.pot
index 7eb58786..b7372495 100644
--- a/po/aptitude.pot
+++ b/po/aptitude.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -303,66 +303,55 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr ""
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr ""
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -370,11 +359,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr ""
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -382,11 +371,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr ""
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -394,11 +383,11 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -406,11 +395,11 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr ""
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -421,11 +410,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr ""
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -436,22 +425,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -464,15 +453,15 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr ""
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr ""
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr ""
 
@@ -576,117 +565,115 @@ msgstr ""
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already installed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already going to be installed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, 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:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr ""
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
 "      virtual package \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr ""
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, 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:560
+#: src/cmdline/cmdline_action.cc:555
 #, 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:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -700,7 +687,7 @@ msgid ""
 "packages contain \"%s\" in their description:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr ""
@@ -722,28 +709,22 @@ msgstr ""
 msgid "Changelog download failed: %s"
 msgstr ""
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr ""
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, c-format
 msgid "Couldn't run pager %s"
 msgstr ""
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
+msgid "The clean command takes no arguments"
 msgstr ""
 
 #: src/cmdline/cmdline_clean.cc:66
@@ -751,68 +732,59 @@ msgstr ""
 msgid "Del %s* %spartial/*\n"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
+msgid "download: you must specify at least one package to download"
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr ""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -846,30 +818,21 @@ msgid "[Working]"
 msgstr ""
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
-msgstr ""
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
+msgid "The forget-new command takes no arguments"
 msgstr ""
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr ""
@@ -976,33 +939,33 @@ msgstr ""
 msgid "The following partially installed packages will be configured:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, 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:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1013,14 +976,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  %s::CmdLine::Ignore-Trust-Violations is 'true'!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1031,7 +994,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1040,199 +1003,199 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1240,45 +1203,45 @@ msgid ""
 "The following actions are available:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1286,52 +1249,52 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 msgid "'a': the package was automatically installed or removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1339,7 +1302,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1347,7 +1310,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1355,7 +1318,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1363,7 +1326,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1371,7 +1334,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1491,6 +1454,11 @@ msgstr ""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr ""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr ""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1637,7 +1605,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1665,7 +1633,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr ""
 
@@ -1695,7 +1663,7 @@ msgid ""
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1704,23 +1672,22 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
+msgid "iconv of %s failed"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
 msgstr ""
 
 #: src/cmdline/cmdline_show_broken.cc:81
@@ -1764,7 +1731,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr ""
@@ -1987,7 +1954,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr ""
 
@@ -2001,14 +1968,8 @@ msgstr ""
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr ""
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
 msgstr ""
 
 #: src/cmdline/cmdline_simulate.cc:66
@@ -2020,13 +1981,12 @@ msgstr ""
 msgid "Internal Error, Ordering didn't finish"
 msgstr ""
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
+msgid "The update command takes no arguments"
 msgstr ""
 
 #: src/cmdline/cmdline_user_tag.cc:65
@@ -2044,132 +2004,152 @@ msgstr ""
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
-#, c-format
-msgid "No candidate version found for %s\n"
-msgstr ""
-
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No current or candidate version found for %s\n"
+msgid "No candidate version found for %s"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
+msgid "No current or candidate version found for %s"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:239
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:273
-#, c-format
-msgid "Couldn't find task '%s'"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:937
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:966
+#, c-format
+msgid "Couldn't find any package for pattern '%s'"
+msgstr ""
+
+#: src/cmdline/cmdline_versions.cc:126
 #, c-format
 msgid "Package %s:"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, c-format
 msgid "Source package %s:"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, c-format
 msgid "Archive %s:"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+msgid "versions: You must provide at least one package selector"
 msgstr ""
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2192,7 +2172,7 @@ msgstr ""
 msgid "Candidate"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr ""
 
@@ -2294,20 +2274,18 @@ msgstr ""
 msgid "Packages requiring %s:"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 
 #: src/cmdline/cmdline_why.h:212
@@ -2334,11 +2312,11 @@ msgstr ""
 msgid "UNAVAILABLE"
 msgstr ""
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr ""
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr ""
 
@@ -2534,31 +2512,31 @@ msgid ""
 "you make to the states of packages will NOT be preserved!"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2625,34 +2603,40 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2795,13 +2779,13 @@ msgid ""
 "Log complete.\n"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 msgid "Filtering packages"
 msgstr ""
 
@@ -2907,18 +2891,18 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr ""
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, c-format
 msgid "Failed to download changelogs: %s"
 msgstr ""
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 msgid "Failed to download changelogs: unexpected exception."
 msgstr ""
 
@@ -2966,25 +2950,26 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr ""
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr ""
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 msgid "No tag descriptions are available."
 msgstr ""
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, c-format
 msgid "No description available for %s."
 msgstr ""
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3127,43 +3112,43 @@ msgstr ""
 msgid "_File"
 msgstr ""
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 msgid "Restart the program as root; your settings will be preserved"
 msgstr ""
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr ""
 
@@ -3171,7 +3156,7 @@ msgstr ""
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
@@ -3202,7 +3187,7 @@ msgid "_Help"
 msgstr ""
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3210,19 +3195,19 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr ""
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr ""
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr ""
 
@@ -3389,7 +3374,7 @@ msgid "Fix Manually"
 msgstr ""
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr ""
 
@@ -3893,11 +3878,11 @@ msgstr ""
 msgid "Reinstall"
 msgstr ""
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr ""
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr ""
 
@@ -3929,7 +3914,7 @@ msgstr ""
 msgid "Download already running."
 msgstr ""
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
@@ -3988,41 +3973,41 @@ msgstr ""
 msgid "Asking whether to replace the configuration file %s"
 msgstr ""
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr ""
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr ""
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr ""
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr ""
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr ""
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr ""
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4032,60 +4017,60 @@ msgstr[1] ""
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr ""
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr ""
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr ""
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr ""
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr ""
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr ""
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr ""
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4120,7 +4105,7 @@ msgstr ""
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4164,15 +4149,15 @@ msgstr ""
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr ""
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr ""
@@ -4820,257 +4805,258 @@ msgstr ""
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr ""
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr ""
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr ""
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr ""
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr ""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr ""
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr ""
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr ""
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr ""
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr ""
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr ""
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr ""
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr ""
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr ""
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
 msgstr ""
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr ""
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr ""
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr ""
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr ""
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr ""
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr ""
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr ""
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr ""
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr ""
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr ""
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr ""
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr ""
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
 msgstr ""
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr ""
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr ""
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr ""
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr ""
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr ""
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr ""
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr ""
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr ""
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
 msgstr ""
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5078,7 +5064,7 @@ msgid ""
 "                why one or more packages would require the given package.\n"
 msgstr ""
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5087,280 +5073,260 @@ msgid ""
 "                lead to a conflict with the given package if installed.\n"
 msgstr ""
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr ""
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr ""
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr ""
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr ""
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
 msgstr ""
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
 msgstr ""
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr ""
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
 msgstr ""
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr ""
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies.\n"
 msgstr ""
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr ""
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr ""
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr ""
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 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:393
+#: src/main.cc:359
 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:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 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:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 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:408
+#: src/main.cc:374
 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:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
-#, c-format
-msgid "Invalid logger name \"%s\"."
-msgstr ""
-
-#: src/main.cc:765
+#: src/main.cc:456
 #, c-format
-msgid "Expected a number after -q=\n"
+msgid "Invalid logger name \"%s\""
 msgstr ""
 
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr ""
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr ""
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr ""
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 msgid "first-package"
 msgstr ""
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 msgid "all-packages"
 msgstr ""
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5368,33 +5334,29 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr ""
 
-#: src/main.cc:1088
+#: src/main.cc:837
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
-msgstr ""
-
-#: src/main.cc:1105
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
+msgid "Unknown command \"%s\""
 msgstr ""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr ""
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5410,7 +5372,7 @@ msgstr ""
 msgid "Search backwards for: "
 msgstr ""
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr ""
 
@@ -5618,7 +5580,7 @@ msgstr ""
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr ""
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr ""
 
@@ -5699,8 +5661,8 @@ msgstr ""
 msgid "<none>"
 msgstr ""
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr ""
@@ -5834,7 +5796,7 @@ msgstr ""
 msgid "Internal error: Default column string is unparsable"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr ""
 
@@ -5960,21 +5922,17 @@ msgstr ""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr ""
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr ""
@@ -6539,7 +6497,7 @@ msgstr ""
 msgid "Really quit Aptitude?"
 msgstr ""
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -6615,7 +6573,7 @@ msgstr ""
 msgid "License"
 msgstr ""
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 
@@ -6636,7 +6594,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr ""
 
@@ -6665,7 +6623,7 @@ msgstr ""
 msgid "FAQ"
 msgstr ""
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr ""
 
@@ -6700,15 +6658,15 @@ msgid ""
 "not see this message again."
 msgstr ""
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr ""
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr ""
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -6716,610 +6674,610 @@ msgid ""
 "what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr ""
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr ""
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr ""
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr ""
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr ""
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr ""
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 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:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr ""
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr ""
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr ""
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr ""
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr ""
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr ""
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr ""
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr ""
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr ""
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr ""
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr ""
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 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:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr ""
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 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:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr ""
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr ""
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr ""
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr ""
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr ""
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr ""
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr ""
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr ""
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr ""
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr ""
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr ""
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr ""
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr ""
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr ""
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr ""
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr ""
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr ""
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr ""
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr ""
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr ""
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr ""
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr ""
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr ""
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr ""
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr ""
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr ""
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr ""
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr ""
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr ""
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr ""
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr ""
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr ""
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr ""
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr ""
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr ""
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr ""
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr ""
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr ""
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr ""
 
@@ -7346,7 +7304,3 @@ msgstr ""
 #, c-format
 msgid "Downloading the changelog of %s"
 msgstr ""
-
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr ""
diff --git a/po/ar.gmo b/po/ar.gmo
index 35406c0d..508fd111 100644
--- a/po/ar.gmo
+++ b/po/ar.gmo
diff --git a/po/ar.po b/po/ar.po
index 3381bf60..931922b3 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude_po\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 13:13+0800\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -310,66 +310,55 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "عنوان URL لاستخدامه عند تنزيل سجلّات التغيير"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "إظهار معاينة لما سيتم عمله قبل القيام به"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "نسيان ما هي الحزم \"الجديدة\" حالما يتم تحديث لوائح الحزم"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "نسيان ما هي الحزم \"الجديدة\" حالما يتم تثبيت أو إزالة حزم"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "عدم إظهار تحذير عن إتمام التغيير الأول �ي وضع القراءة �قط"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr "تحذير عند محاولة القيام بعمل يتطلب تصريحا كمستخدم غير الجذر"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -377,11 +366,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "المل� المطلوب تسجيل الأعمال عليه"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -389,11 +378,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "حلّ المعتمدات تلقائياً للحزمة عندما يتم اختيارها"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -401,11 +390,11 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "إصلاح الحزم المعطوبة تلقائياً قبل التثبيت أو الإزالة"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -413,12 +402,12 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 #, fuzzy
 msgid "Install recommended packages automatically"
 msgstr "تثبيت الحزم المقترحة تلقائيّاً"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -429,11 +418,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "إزالة الحزم الغير مستخدمة تلقائياً"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -444,22 +433,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -472,17 +461,17 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 #, fuzzy
 msgid "UI options"
 msgstr "خيارات ^واجهة المستخدم"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 #, fuzzy
 msgid "Dependency handling"
 msgstr "إ^دارة المعتمدات"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "مت�رقات"
 
@@ -597,7 +586,7 @@ msgstr "لم ي�عثر على الأرشي� \"%s\" للحزمة \"%s\"\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "تعذر سرد المل�ات من \"%s\""
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -606,7 +595,7 @@ msgstr ""
 "ملاحظة: \"%s\"، التي تو�ر الحزمة الوهمية\n"
 "      \"%s\"، هي مثبّتة مسبقاً.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -615,7 +604,7 @@ msgstr ""
 "ملاحظة: \"%s\"، التي تو�ر الحزمة الوهمية\n"
 "      \"%s\"، سيتم تثبيتها مسبقاً.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -624,17 +613,23 @@ msgstr ""
 "\"%s\" موجودة �ي قاعدة بيانات الحزم، إلا أنّها ليست\n"
 "حزمة حقيقية ولا يو�ّرها أي من الحزم.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" هي حزمة وهميّة تو�ّرها:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "يجب أن تختار واحدة لتثبيتها.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "الحزمة %s غير مثبتة، لن يمكن منع الترقية\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -643,63 +638,56 @@ msgstr ""
 "ملاحظة: تحديد \"%s\" بدلاً من\n"
 "      الحزمة الوهمية \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s مثبتة مسبقاً بالنسخة المطلوبة (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 #| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s غير مثبتة حالياً، لذا لن يتم تثبيتها مجدداً.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 #| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s مثبتة مسبقاً بالنسخة المطلوبة (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s غير مثبتة حالياً، لذا لن يتم تثبيتها مجدداً.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "الحزمة %s غير مثبتة، لذا لن يتم إزالتها\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "الحزمة %s غير مثبتة، لن يمكن منع الترقية\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "الحزمة %s غير قابلة للترقية، لا يمكن منع الترقية\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "ملاحظة: تحديد المهمة \"%s: %s\" للتثبيت\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
-"يمكنك تحديد نسخة حزمة �قط مع أمر التثبيت 'install' أو أمر 'forbid-version'\n"
+"يمكنك تحديد نسخة حزمة �قط مع أمر التثبيت 'install' أو أمر 'forbid-version'"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "يمكنك تحديد أرشي� حزمة �قط مع أمر التثبيت 'install'\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "يمكنك تحديد أرشي� حزمة �قط مع أمر التثبيت 'install'"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -708,7 +696,7 @@ msgstr ""
 "تعذر العثور على \"%s\"، وأكثر من 40\n"
 "حزمة تحتوي %s\" �ي اسمها.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -717,12 +705,12 @@ msgstr ""
 "تعذر العثور على \"%s\".  على كلّ، الحزمة\n"
 "التالية تحتوي %s\" �ي اسمها:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "تعذر العثور على أيّة حزمة يطابق اسمها أو وص�ها \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -740,7 +728,7 @@ msgstr ""
 "تعذر العثور على أيّة حزمة تطابق \"%s\".  على كلّ، الحزم\n"
 "التالية تحتوي %s\" �ي وص�ها:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "حر� عمل سيء '%c'\n"
@@ -765,29 +753,24 @@ msgstr "خطأ "
 msgid "Changelog download failed: %s"
 msgstr "سجل تغييرات %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "لا يمكن تشغيل أي مص�ّح، هل هذا نظام ديبيان عامل؟"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "الحزمة %s ليست حزمة دبيان رسميّة، لذا لا يمكن عرض سجل تغييرها."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "تعذر العثور على سجل تغيير لـ%s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 #| msgid "Couldn't find a changelog for %s"
 msgid "Couldn't run pager %s"
 msgstr "تعذر العثور على سجل تغيير لـ%s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, fuzzy, c-format
-msgid "E: The clean command takes no arguments\n"
+#, fuzzy
+msgid "The clean command takes no arguments"
 msgstr "خطأ: أمر التحديث لا يتطلّب أي م�عطيات\n"
 
 #: src/cmdline/cmdline_clean.cc:66
@@ -795,71 +778,64 @@ msgstr "خطأ: أمر التحديث لا يتطلّب أي م�عطيات\n"
 msgid "Del %s* %spartial/*\n"
 msgstr "حذ� %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 #| msgid "Unable to look up your home directory, saving to /tmp/function_pkgs!"
 msgid "Unable to lock the download directory"
 msgstr ""
 "تعذر التعر� على مكان دليلك الموطن، لذا سيتم الح�ظ �ي /tmp/function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "حذ� %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, fuzzy, c-format
-msgid "E: The autoclean command takes no arguments\n"
+#: src/cmdline/cmdline_clean.cc:127
+#, fuzzy
+msgid "The autoclean command takes no arguments"
 msgstr "خطأ: أمر التحديث لا يتطلّب أي م�عطيات\n"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "سو� ي�رغ %sبايت من مساحة القرص\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "حرّرت %s بايت من مساحة القرص\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "عملية غير صالحة %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "م�عطى صيغة غير متوقع يتبع \"إبقاء الكل\""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, fuzzy, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+#, fuzzy
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr "تعذر إرضاء المعتمدات."
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "إجهاض.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "التنزيل: يجب تحديد حزمة واحدة على الأقل لتنزيلها\n"
+msgid "download: you must specify at least one package to download"
+msgstr "التنزيل: يجب تحديد حزمة واحدة على الأقل لتنزيلها"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "تعذرت قراءة لائحة المصادر"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "تعذر العثور على أيّة حزمة بالاسم \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -901,30 +877,22 @@ msgid "[Working]"
 msgstr " [يعمل]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "لا توجد حزمة بالاسم \"%s\""
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, fuzzy, c-format
-msgid "E: The forget-new command takes no arguments\n"
+#, fuzzy
+msgid "The forget-new command takes no arguments"
 msgstr "خطأ: أمر التحديث لا يتطلّب أي م�عطيات\n"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "قد ينسى ما هي الحزم الجديدة\n"
@@ -1035,17 +1003,17 @@ msgstr "ستتم ترقية الحزم التالية:"
 msgid "The following partially installed packages will be configured:"
 msgstr "ستتم ترقية الحزم التالية:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "الحزم الأساسيّة التالية سيتم إزالتها!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "ستصبح الحزم الأساسية التالية معطوبة بسبب هذا العمل:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1054,16 +1022,16 @@ msgstr ""
 "تحذير: إجراء هذا العمل سيتسبب على الأرجح بإعطاب نظامك!\n"
 "         لا ت�كمل ما لم تكن متأكّداً مما تقوم به بالضبط!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "أعلم أن هذه �كرة سيئة جداً"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "للاستمرار، اكتب الجملة \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, fuzzy, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1079,7 +1047,7 @@ msgstr ""
 "هذا ما تريد القيام به. \n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1089,7 +1057,7 @@ msgstr ""
 "                   الخيار %s::CmdLine::Ignore-Trust-Violations محدد بالقيمة "
 "'true'!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 #, fuzzy
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1104,7 +1072,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1113,137 +1081,137 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "هل تريد تجاهل هذا التحذير والاستمرار على أي حال؟\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "للاستمرار، اكتب \"%s\"; للتجاهل، اكتب \"%s\": "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "لا يمكن التعر� على المدخلات.  أدخل إما \"%s\" أو \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "الحزم التالية مقترحة ولكن لن يتم تثبيتها:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "الحزم التالية مقترحة ولكن لن يتم تثبيتها:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "لن يتم تثبيت، أو ترقية، أو إزالة أية حزم.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu حزمة تمت ترقيتها، و%lu حزمة جديدة تم تثبيتها، "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu تمت إعادة تثبيتها، "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu تم تثبيطها، "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu سيتم إزالتها و %lu لم يتم ترقيتها.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "نحتاج إلى جلب %sب/%sب من الأرشي�. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "يجب جلب %sب من الأرشي�. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "�ك �ك التغلي� سيستخدم %sب.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "�ك �ك التغلي� سي�رغ %sب.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "ليست هناك حزم لإظهارها -- أدخل أسماء الحزم على السطر بعد 'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "إضغط زر الإدخال للاستمرار."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "لم يعثر على أية حزم -- أدخل أسماء الحزم على السطر بعد 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "الاستمرار بالتثبيت"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "الإجهاض والخروج"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr "إظهار معلومات حول واحد أو أكثر من الحزم؛ أسماء الحزم يجب أن تتبع 'i'"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1251,63 +1219,63 @@ msgstr ""
 "إظهار سجلات تغيير ديبيان لواحد أو أكثر من الحزم؛ يجب أن تتبع أسماء الحزم "
 "الحر� 'c'"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "عكس عرض معلومات المعتمدات"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "عكس عرض التغييرات �ي أحجام الحزم"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "عكس عرض أرقام النسخ"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "دخول الواجهة المرئية الكاملة"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1318,45 +1286,45 @@ msgstr ""
 "الإجراء متبوعاً بواحد أو أكثر من أسماء الحزم (أو التعابير). سيطبق الإجراء على "
 "جميع الحزم التي تسردها. الإجراءات التالية هي المتو�رة:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' لتثبيت الحزم"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr "'+M' لتثبيت الحزم ولتوّه سيشار إليها كمثبّتة تلقائيا"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' لإزالة الحزم"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' لتنظي� الحزم"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' لوضع الحزم قيد الإبقاء"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':' لإبقاء الحزم على وضعها الحالي دون جعلها �ي وضع الإبقاء"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' لتحديد الحزم بالتثبيت التلقائي"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' لتحديد الحزم بالتثبيت اليدوي"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1364,54 +1332,54 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 #| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' لتحديد الحزم بالتثبيت التلقائي"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "أوامر:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "هل تريد الاستمرار؟ [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "ردّ غير صالح.  رجاء أدخل أمراً صالحاً أ '؟' للمساعدة.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1422,7 +1390,7 @@ msgstr ""
 "سو� تظهر معلومات المعتمدات.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1433,7 +1401,7 @@ msgstr ""
 "لن تظهر معلومات المعتمدات.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1444,7 +1412,7 @@ msgstr ""
 "ستظهر معلومات النسخة.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1455,7 +1423,7 @@ msgstr ""
 "لن تظهر معلومات النسخة.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1466,7 +1434,7 @@ msgstr ""
 "ستظهر تغييرات الحجم.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1593,6 +1561,11 @@ msgstr "توقع قيمة واحدة على الأقل لاسم/نسخة الحØ
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "توقع النسخة بعد \"%s\""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "لا توجد حزمة بالاسم \"%s\""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1745,7 +1718,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1773,7 +1746,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "الأوامر التالية متو�ّرة:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "اسم المل� المطلوب تسجيل وضع المحلّل إليه:"
 
@@ -1803,7 +1776,7 @@ msgid ""
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1812,25 +1785,24 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "تعذر إرضاء المعتمدات!  الاستسلام..."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "تعذر إرضاء المعتمدات."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "�شل تن�يذ iconv على%s.\n"
+msgid "iconv of %s failed"
+msgstr "�شل تن�يذ iconv على%s"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "البحث: يجب أن تعطي كلمة بحث واحدة على الأقل\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "البحث: يجب أن تعطي كلمة بحث واحدة على الأقل"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1875,7 +1847,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "الحزم التالية لها معتمدات غير متو�رة:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2100,7 +2072,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "ي�و�ّر"
 
@@ -2114,15 +2086,9 @@ msgstr "الوص�: "
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "تعذر العثور على الحزمة %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "تعذر إعراب الصيغة %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "لم ي�عثر على أية حزم"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2133,13 +2099,14 @@ msgstr "سيقوم بتنزيل/تثبيت/إزالة الحزم.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "خطأ داخلي، لم ينته الترتيب"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "حذ� المل�ات المنزلة الملغاة"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
+#, fuzzy
+#| msgid "E: The update command takes no arguments\n"
+msgid "The update command takes no arguments"
 msgstr "خطأ: أمر التحديث لا يتطلّب أي م�عطيات\n"
 
 #: src/cmdline/cmdline_user_tag.cc:65
@@ -2157,43 +2124,36 @@ msgstr "لم ي�عثر على ن�سخة \"%s\" للحزمة \"%s\"\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "لم يتم العثور على النسخة المرشحة ل %s\n"
+msgid "No candidate version found for %s"
+msgstr "لم يتم العثور على النسخة المرشحة ل %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "لم يتم العثور على نسخة حالية أو مرشحة لـ%s\n"
+msgid "No current or candidate version found for %s"
+msgstr "لم يتم العثور على نسخة حالية أو مرشحة لـ%s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "لم ي�عثر على الأرشي� \"%s\" للحزمة \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "لم ي�عثر على الأرشي� \"%s\" للحزمة \"%s\""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "لم ي�عثر على ن�سخة \"%s\" للحزمة \"%s\"\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "لم ي�عثر على ن�سخة \"%s\" للحزمة \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "خطأ داخلي: القيمة %i الغير صالحة م�رّرت إلى cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "خطأ داخلي: القيمة %i الغير صالحة م�رّرت إلى cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "لا يمكنك تحديد كل من الأرشي� والنسخة للحزمة\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "لا يمكنك تحديد كل من الأرشي� والنسخة للحزمة"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't find a changelog for %s"
-msgid "Couldn't find task '%s'"
-msgstr "تعذر العثور على سجل تغيير لـ%s"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
@@ -2202,7 +2162,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
@@ -2211,7 +2171,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
@@ -2220,12 +2180,12 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
@@ -2234,7 +2194,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
@@ -2243,61 +2203,90 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "تعذر العثور على الحزمة %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find task '%s'"
+msgstr "تعذر العثور على سجل تغيير لـ%s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "ملاحظة: تحديد المهمة \"%s: %s\" للتثبيت\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "تعذر العثور على سجل تغيير لـ%s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 #| msgid "Packages"
 msgid "Package %s:"
 msgstr "الحزم"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 #| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "الحزمة المصدرية: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 #| msgid "Archive"
 msgid "Archive %s:"
 msgstr "أرشي�"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
 #| msgid "search: You must provide at least one search term\n"
-msgid "versions: You must provide at least one package selector\n"
+msgid "versions: You must provide at least one package selector"
 msgstr "البحث: يجب أن تعطي كلمة بحث واحدة على الأقل\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2323,7 +2312,7 @@ msgstr ""
 msgid "Candidate"
 msgstr "CandVer"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "تثبيت"
 
@@ -2428,21 +2417,19 @@ msgstr "تعذر ايجاد حلّ للاستعمال."
 msgid "Packages requiring %s:"
 msgstr "الحزم التي تعتمد على %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, fuzzy, c-format
 msgid "No package named \"%s\" exists."
 msgstr "تعذر العثور على أيّة حزمة بالاسم \"%s\""
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 #, fuzzy
 msgid "Unable to parse some match patterns."
 msgstr "تعذر إعراب الصيغة %s"
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 
 #: src/cmdline/cmdline_why.h:212
@@ -2470,11 +2457,11 @@ msgstr "غير مستو�ى"
 msgid "UNAVAILABLE"
 msgstr "غير متو�ر"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "علامات"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 #, fuzzy
 msgid "User Tags"
 msgstr "علامات"
@@ -2678,31 +2665,31 @@ msgstr ""
 "تعذر ق�ل مل� المخزن. سيتم �تحه بوضع القراءة �قط;أي تغييرات سو� تقوم بها على "
 "حالة الحزم لن يتم ح�ظها!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "رئيسي"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2769,34 +2756,42 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr "مخزن الحزم ليس متو�راً; تعذر تنزيل وتثبيت الحزم"
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "خطأ داخلي: تعذر توليد لائحة الحزم المطلوب تنزيلها"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, fuzzy, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "�شل تغيير اسم %s إلى %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"تعذر إحضار بعض الأرشي�، ربما يمكنك محاولة تن�يذ aptitude update أو إضا�ة --"
+"fix-missingØŸ"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "تعذر التصحيح من أجل الحزم الغير متو�رة"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "�شل تثبيت أحد الحزم.  محاولة كل المشكلة:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr "تعذر الحصول على ق�ل النظام! (قد يكون apt أو dpkg آخر يعمل؟)"
@@ -2946,13 +2941,13 @@ msgstr ""
 "\n"
 "اكتمل التسجيل.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 #| msgid "Downloading packages"
 msgid "Filtering packages"
@@ -3064,19 +3059,19 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "مل�ات �هرس الحزمة �اسدة. لا اسم مل�: الحقل للحزمة %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "سجل تغييرات %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "عنوان URL لاستخدامه عند تنزيل سجلّات التغيير"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
@@ -3127,28 +3122,29 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "تعذر إعراب الصيغة %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "بناء قاعدة بيانات العلامات"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 #| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "غير مثبتة"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 #| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "غير مثبتة"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3306,39 +3302,39 @@ msgstr ""
 msgid "_File"
 msgstr "إغلاق"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "إجراء كل عمليات التثبيت والإزالة المؤخَّرة"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "التحقق من وجود نسخ جديدة من الحزم"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "تعليم كل الحزم القابلة للترقية والتي ليست مبقاة للترقية"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "نسيان أيّ الحزم هي \"جديدة\""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "إلغاء جميع التثبيتات، والإزالات، والإبقاءات، والترقيات المؤجلة."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "حذ� مل�ات الحزم التي تم تنزيلها من قبل"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "حذ� مل�ات الحزم التي لا يمكن تنزيلها بعد الآن"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "إعادة تحميل مخزن الحزم"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3348,7 +3344,7 @@ msgstr ""
 "استخدم 'su' كي تصبح المستخدم root؛ سيقوم هذا بإعادة تشغيل البرنامج، ولكن "
 "سيتم الإبقاء على إعداداتك"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "الخروج من البرنامج"
 
@@ -3356,7 +3352,7 @@ msgstr "الخروج من البرنامج"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "التراجع عن آخر عملية حزمة أو مجموعة من العمليات"
 
@@ -3393,7 +3389,7 @@ msgid "_Help"
 msgstr "مساعدة"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3403,19 +3399,19 @@ msgstr ""
 msgid "Update"
 msgstr "تحديث القائمة"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "الحزم"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "معاينة"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "مقدم الحلول"
 
@@ -3620,7 +3616,7 @@ msgid "Fix Manually"
 msgstr "تحديد يدوي"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "ترقية"
 
@@ -4212,11 +4208,11 @@ msgstr "م�ثبّتة"
 msgid "Reinstall"
 msgstr "إعادة التثبيت"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "تثبيط"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "إزالة"
 
@@ -4254,7 +4250,7 @@ msgstr "تص�ية لائحة الحزم"
 msgid "Download already running."
 msgstr "جاري التحميل..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "هناك عملية تحديث أو تثبيت حزم تجري حالياً."
 
@@ -4322,29 +4318,29 @@ msgstr "ليست هناك حزم معطوبة"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "تعذر استبدال %s بمل� التهيئة الجديد"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "تنزيل الحزم"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "ليست هناك حزم معطوبة"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "ليست هناك حزم معطوبة"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 #| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "إرضاء المعتمدات"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 #| msgid "No packages are broken."
 msgid "%d package is broken"
@@ -4354,13 +4350,13 @@ msgstr[1] "ليس هناك حزم معطوبة."
 msgstr[2] "ليس هناك حزم معطوبة."
 msgstr[3] "ليس هناك حزم معطوبة."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 #| msgid "%s changes"
 msgid "View changes"
 msgstr "%s تغييرات"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 #| msgid "%s changes"
 msgid "Apply changes"
@@ -4369,7 +4365,7 @@ msgstr "%s تغييرات"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 #| msgid "%d install"
 #| msgid_plural "%d installs"
@@ -4383,7 +4379,7 @@ msgstr[3] "%d تثبيت"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 #| msgid "failed to remove %s"
 msgid "%d package to remove"
@@ -4393,62 +4389,62 @@ msgstr[1] "تعذرت إزالة %s"
 msgstr[2] "تعذرت إزالة %s"
 msgstr[3] "تعذرت إزالة %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 #| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "حجم التنزيل"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 #| msgid "not installed"
 msgid "Not implemented"
 msgstr "غير مثبتة"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 #| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "م�ثبّتة"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 #| msgid "^Purge"
 msgid "Purge"
 msgstr "^إلغاء"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "إبقاء"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "إبقاء"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 #| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "دليل المستخدم"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4489,7 +4485,7 @@ msgstr "لا"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4540,19 +4536,19 @@ msgstr "%s; سيتم تثبيتها آلياً"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 #| msgid "Search"
 msgid "Searching..."
 msgstr "بحث"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 #| msgid "Building view"
 msgid "Finalizing view"
 msgstr "بناء العرض"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "بناء العرض"
@@ -5311,115 +5307,116 @@ msgstr "'%s' نوع محاذاة مجهول"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 #| msgid "By-name sorting policies take no arguments"
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "سياسات ال�رز بحسب الاسم لا تحتاج إلى أية معطيات"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "اسم سياسية ال�رز ال�ارغ غير صالح"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "حر� '(' ليس له مقابل �ي وص� سياسة ال�رز"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "نوع سياسة ال�رز '%s' غير صالح"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "تعذر �ك ترميز سلسلة الأحر� الثنائية البايت بعد \"%ls\""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "تعذر �ك ترميز سلسلة الأحر� العريضة بعد \"%s\""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s جمعت �ي %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "الم�جمّع: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 #, fuzzy
 msgid "Compiled against:\n"
 msgstr "الم�جمّع: g++ %s\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, fuzzy, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "إبقاء %F النسخة %s (%s)"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, fuzzy, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 "\n"
 "نسخة NCurses: %s\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, fuzzy, c-format
 msgid "  NCurses version %s\n"
 msgstr ""
 "\n"
 "نسخة NCurses: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, fuzzy, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "نسخة libsigc++: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "إبقاء %F النسخة %s (%s)"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "إبقاء %F النسخة %s (%s)"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 #| msgid "%s %s compiled at %s %s\n"
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s جمعت �ي %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:181
 #, fuzzy
 msgid ""
 "\n"
@@ -5428,36 +5425,36 @@ msgstr ""
 "\n"
 "نسخة Curses: %s\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, fuzzy, c-format
 msgid "  NCurses version: %s\n"
 msgstr ""
 "\n"
 "نسخة NCurses: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, fuzzy, c-format
 msgid "  cwidget version: %s\n"
 msgstr "نسخة libsigc++: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, fuzzy, c-format
 msgid "  Apt version: %s\n"
 msgstr ""
 "\n"
 "نسخة Curses: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "الاستخدام: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [options] <action> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5467,128 +5464,128 @@ msgstr ""
 "الت�اعلي):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, fuzzy, c-format
 #| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - تثبيت/ترقية الحزم\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, fuzzy, c-format
 #| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - إزالة الحزم\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, fuzzy, c-format
 #| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - إزالة الحزم ومل�ات تهيئتها\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, fuzzy, c-format
 #| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - وضع الحزم على الإبقاء\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, fuzzy, c-format
 #| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - إلغاء أمر الإبقاء لحزمة\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, fuzzy, c-format
 #| msgid ""
 #| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - تعليم الحزم على أنها ث�بّتت تلقائياً\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, fuzzy, c-format
 #| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - تحديد الحزم كم�ثبتة يدوياً\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr " forbid-version - منع aptitude من الترقية إلى نسخة ما من الحزمة.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, fuzzy, c-format
 #| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - تنزيل قوائم الحزم الجديدة/القابلة للترقية\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, fuzzy, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " upgrade      - القيام بترقية آمنة\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, fuzzy, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
 msgstr " dist-upgrade - تن�يذ الترقية، مع تثبيت وإزالة الحزم على الأرجح\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, fuzzy, c-format
 #| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - نسيان أي الحزم هي \"جديدة\"\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, fuzzy, c-format
 #| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - البحث عن حزمة باسمها و/أو بصيغة\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - عرض معلومات م�صلة حول حزمة\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - عرض معلومات م�صلة حول حزمة\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, fuzzy, c-format
 #| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - حذ� مل�ات الحزم المنزلة\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, fuzzy, c-format
 #| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - إزالة مل�ات الحزم المنزلة القديمة\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, fuzzy, c-format
 #| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - عرض سجل تغييرات حزمة\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, fuzzy, c-format
 #| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - تنزيل المل� .deb لحزمة\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, fuzzy, c-format
 #| msgid ""
 #| " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5598,7 +5595,7 @@ msgid ""
 "package.\n"
 msgstr " reinstall    - تنزيل و(محتمل) إعادة تثبيت حزمةمثبتة حالياً\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, fuzzy, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5606,7 +5603,7 @@ msgid ""
 "                why one or more packages would require the given package.\n"
 msgstr " -Z\t\t    إظهار التغيير �ي حجم تثبيت كل حزمة.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, fuzzy, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5615,58 +5612,58 @@ msgid ""
 "                lead to a conflict with the given package if installed.\n"
 msgstr " -Z\t\t    إظهار التغيير �ي حجم تثبيت كل حزمة.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  خيارات:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             نص المساعدة هذا\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             نص المساعدة هذا\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             تمثيل الإجراءات، لكن دون تن�يذها بال�عل.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr " -d             تنزيل الحزم �قط، دون تثبيت أو إزالة أيها.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, fuzzy, c-format
 #| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             السؤال دائماً للتأكيد أو لتن�يذ الإجراءات\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, fuzzy, c-format
 #| msgid ""
 #| " -y             Assume that the answer to simple yes/no questions is "
@@ -5677,7 +5674,7 @@ msgstr ""
 " -y             ا�تراض أن الإجابة على أسئلة الإجابة بنعم أو لا البسيطة هي "
 "'نعم'\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, fuzzy, c-format
 #| msgid ""
 #| " -F format      Specify a format for displaying search results; see the "
@@ -5687,7 +5684,7 @@ msgid ""
 "manual.\n"
 msgstr " -F format      تحديد نسق عرض نتائج البحث؛ راجع التعليمات\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, fuzzy, c-format
 #| msgid ""
 #| " -O order       Specify how search results should be sorted; see the "
@@ -5697,7 +5694,7 @@ msgid ""
 "manual.\n"
 msgstr " -O order       تحديد كي�ية �رز نتائج البحث؛ راجع التعليمات\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, fuzzy, c-format
 #| msgid ""
 #| " -w width       Specify the display width for formatting search results\n"
@@ -5705,28 +5702,28 @@ msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w width       تحديد عرض الإظهار لتنسيق نتائج البحث\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             محاولة إصلاح الحزم المعطوبة بشدة.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             إظهار نسخة الحزم التي سيتم تثبيتها.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             إظهار معتمدات الحزم المغيرة تلقائياً.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    إظهار التغيير �ي حجم تثبيت كل حزمة.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, fuzzy, c-format
 #| msgid ""
 #| " -v             Display extra information. (may be supplied multiple "
@@ -5736,7 +5733,7 @@ msgid ""
 "times).\n"
 msgstr " -v             عرض معلومات إضا�ية. (يمكن استخدامه عدة مرات)\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, fuzzy, c-format
 #| msgid ""
 #| " -t [release]   Set the release from which packages should be installed\n"
@@ -5744,7 +5741,7 @@ msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [release]   تحديد الإصدارة التي يجب تثبيت الحزم منها\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, fuzzy, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5753,13 +5750,13 @@ msgstr ""
 " -q             �ي وضع سطر الأوامر، عدم إظهار\n"
 "مؤشرات التقدم التصاعدي.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, fuzzy, c-format
 #| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=val     تعيين خيار التهيئة المسمى 'key' مباشرة\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, fuzzy, c-format
 #| msgid ""
 #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5771,34 +5768,34 @@ msgstr ""
 " --with(out)-recommends\tتحديد اعتبار الموصى بها\n"
 "                معتمدات ضرورية\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S fname       قراءة معلومات وضع aptitude الشاملة من fname.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             تنزيل قوائم الحزم الجديدة عند بدء التشغيل.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             نص المساعدة هذا\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             القيام بتثبيت عند بدء التشغيل.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  برنامج aptitude هذا ليست له قوى البقرة الخارقة.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 #| msgid "replaces"
 msgid "trace"
@@ -5806,13 +5803,13 @@ 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:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 #| msgid "no"
 msgid "info"
@@ -5820,13 +5817,13 @@ 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:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 #| msgid "Err "
 msgid "error"
@@ -5834,102 +5831,82 @@ 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:408
+#: src/main.cc:374
 #, fuzzy
 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:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
 #| msgid "Invalid operation %s"
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "عملية غير صالحة %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "توقع رقم بعد -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "توقع رقم بعد -q=، لكن وجد %s\n"
-
-#: src/main.cc:798
-#, fuzzy, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "يتطلب المعطى -o معطى آخر بالشكل key=value، ولكن وجد %s"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "عجباً: استقبل رمز خير مجهول\n"
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 #| msgid "Package"
 msgid "first-package"
 msgstr "حزمة"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 #| msgid "All Packages"
 msgid "all-packages"
 msgstr "كل الحزم"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5937,40 +5914,34 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 #| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "يمكن تحديد -u أو -i �قط\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 #| msgid ""
 #| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr "-u و -i لا يمكن تحديدها �ي وضع سطر الأوامر (مثلاً، مع 'install')"
 
-#: src/main.cc:1105
-#, fuzzy
-#| msgid "-u and -i may not be specified with a command"
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "لا يمكن تحديد -u و -i مع أمر واحد"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "أمر غير معرو� \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "أمر غير معرو� \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "استثناء غير معالج: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, fuzzy, c-format
 msgid ""
 "Backtrace:\n"
@@ -5988,7 +5959,7 @@ msgstr "البحث عن: "
 msgid "Search backwards for: "
 msgstr "البحث رجوعاً عن:"
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "كانسة الألغام"
 
@@ -6198,7 +6169,7 @@ msgstr "ترميز mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "حزمة"
 
@@ -6279,8 +6250,8 @@ msgstr "<N/A>"
 msgid "<none>"
 msgstr "<none>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "وهمي"
@@ -6414,7 +6385,7 @@ msgstr "تعذر تحميل نسق إظهار الحزمة بعد \"%ls\""
 msgid "Internal error: Default column string is unparsable"
 msgstr "خطأ داخلي: نص العمود الا�تراضي غير قابل للقراءة"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "المهام"
 
@@ -6566,21 +6537,17 @@ msgstr "Ù�هارس المطابقة يجب أن تكون 1 أو أكثر، ولÙ
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "�هرس المطابقة %ls كبير جداً; المجموعات المتو�رة هي (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "الحزم الغير معلّمة"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "علامة م�قودة"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "الحزمة المصدرية: "
@@ -7186,7 +7153,7 @@ msgstr "تحميل المخزن"
 msgid "Really quit Aptitude?"
 msgstr "حقاً تريد الخروج من Aptitude؟"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -7268,7 +7235,7 @@ msgstr ""
 msgid "License"
 msgstr "^الرخصة"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 #, fuzzy
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "عرض الشروط التي يمكنك نسخ البرنامج ضمنها"
@@ -7290,7 +7257,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "مساعدة"
 
@@ -7319,7 +7286,7 @@ msgstr "تحديد يدوي"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "عرض لائحة بالأسئلة الأكثر طرحاً"
 
@@ -7359,15 +7326,15 @@ msgstr ""
 "مهمة ومن الآمن مسحها.%n%nهل تريدإزالة هذا الدليل وجميع محتوياته؟  إن قمت "
 "باختيار \"لا\"، سو� لن ترى هذه الرسالة مجدداً."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "عرض سريان تحميل الحزم"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "تنزيل الحزمة"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7378,42 +7345,42 @@ msgstr ""
 "%Bتعرّض أمن نظامك إلى خطر%b. قم بتثبيتها �قط �ي حالة إذا ما كنت متأكّد  أنه "
 "هذا ما تريد القيام به. %n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [النسخة %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "استمر بال�عل"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "إجهاض التثبيت"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "معاينة تثبيت الحزم"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "عرض و/أو تعديل الأعمال التي ستتم"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "بعض الحزم كانت معطوبة وتمّ إصلاحها:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "لا يوجد حل لمشكلة هذه المعتمدات!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "ن�ذ الوقت أثناء محاولة حل المعتمدات (اضغط \"%s\" للمحاولة بجهد)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7421,19 +7388,19 @@ msgstr ""
 "تثبيت/إزالة الحزم بتطلب صلاحيات إداريّة، والتي لا تملكها حاليّاً.  هل تود "
 "التغيّر إلى حساب root؟"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "تحوّ�ل إلى root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "لا تحوّل إلى root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "لم يتمّ جدولة تثبيت، أو إزالة أو ترقية أيّة حزم."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7442,19 +7409,19 @@ msgstr ""
 "لن يتم تثبيت، أو إزالة أو ترقية أيّة حزم. يمكن ترقية بعض الحزم، إلا أنّك لم "
 "تختر ترقيتها. اكتب \"U\" كي تحضّر الترقية."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "تحديث لوائح الحزم"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "عرض سريان تحديث لائحة الحزم"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "تحديث القائمة"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7462,23 +7429,23 @@ msgstr ""
 "تحديث لوائح الحزم يتطلب صلاحيات إداريّة، والتي لا تملكها حاليّاً.  هل تود "
 "التغيّر إلى حساب المستخدم root؟"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "إضاعة الوقت بمحاولة البحث عن الألغام"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "التنظي� أثناء القيام بالتنزيل غير مسموح به"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "حذ� المل�ات المنزلة"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "تم حذ� مل�ات الحزم المنزلة"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7490,11 +7457,11 @@ msgstr ""
 "تحديث لوائح الحزم يتطلب صلاحيات إداريّة، والتي لا تملكها حاليّاً.  هل تود "
 "التغيّر إلى حساب المستخدم root؟"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "مل� مخزن apt ليس متو�راً; التنظي� التلقائي غير ممكن"
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7502,7 +7469,7 @@ msgid ""
 msgstr ""
 "مل�ات الحزم المنزلة الملغاة تم حذ�ها، ما جعل %s بايت من مساحة القرص �ارغة."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7514,131 +7481,131 @@ msgstr ""
 "تحديث لوائح الحزم يتطلب صلاحيات إداريّة، والتي لا تملكها حاليّاً.  هل تود "
 "التغيّر إلى حساب المستخدم root؟"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "لا مزيد من الحلول."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "تعذر ايجاد حلّ للاستعمال."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "ن�ذ الوقت أثناء محاولة البحث عن حل."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "إرضاء المعتمدات"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "البحث عن حلول للمعتمدات الغير الغير مستو�اة"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "تعذر �تح %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "خطأ أثناء ح�ظ حالة مقدم الحلول"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^تثبيت/إزالة الحزم"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^تحديث لائحة الحزم"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "تعليم ال^قابلة للترقية"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^نسيان الحزم الجديدة"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "إل^غاء الأعمال المؤجلة"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^تنظي� مخزن الحزم"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "حذ� المل�اة ال^ملغية"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^إعادة تحميل مخزن الحزم"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^لعب كانسة الألغام"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^تحوّل إلى root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^خروج"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "تراجع"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^تثبيت"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "تعليم الحزمة المحددة حالياً للتثبيت أو الترقية"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "إ^زالة"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "تعليم الحزمة المحددة حالياً للإزالة"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^إلغاء"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "تعليم الحزمة المحددة حالياً ومل�ات تهيئتها للإزالة"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^محا�ظة"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "إلغاء أيّ عمل على الحزمة المحددة"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "إ^بقاء"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "إلغاء أي عمل على الحزمة المحددة، وحمايتها من الترقيات المستقبليّة"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "تحديد ^تلقائي"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7646,11 +7613,11 @@ msgstr ""
 "تحديد الحزمة المختارة على أنها ث�بتت تلقائيّاً؛ سو� يتم إزالتها إن لم تعتمد "
 "عليها أية حزمة أخرى"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "تحديد ^يدوي"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7658,11 +7625,11 @@ msgstr ""
 "تعليم الحزمة المحدّدة على أنها ث�بتت يدويّاً؛ لن يتم إزالتها إلا إن قمت بذلك "
 "يدوياً"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^منع النسخة"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7670,336 +7637,336 @@ msgstr ""
 "منع تثبيت النسخة المرشحة من الحزمة المحددة؛ أما النسخ الأجدد من الحزمة �سيتم "
 "تثبيتها كالعادة"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "^معلومات"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "عرض مزيد من المعلومات حول الحزمة المحدّدة"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^سجل التغيير"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "عرض سجل تغيير دبيان للحزمة المحدّدة"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^�حص الحلّ"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "�حص الحل المحدد حالياً لمشاكل المعتمدات."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "تن�يذ ال^حل"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "تن�يذ الأعمال المشمولة �ي الحل المحدد الحالي."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "ال^حل التالي"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "اختيار الحل التالي لمشاكل المعتمدات."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "الحل ال^سابق"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "اختيار الحل السابق لمشاكل المعتمدات"
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "الح^ل الأول"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "اختيار الحل الأول لمشاكل المعتمدات"
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "الحل الأ^خير"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "اختيار الحل الأخير لمشاكل المعتمدات والتي تم إيجادها حتى الآن."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "عكس المر�و^ضة"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "عكس ما إذا كان العمل المحدد حالياً مر�وضاً."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "عكس ال^مقبول"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "عكس ما إذا كان العمل المحدد حالياً مقبولاً."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^عرض الهد�"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "عرض الحزمة التي ستتأثر بالعمل المحدد"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^بحث"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "البحث قدماً"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "البحث ر^جوعاً"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "البحث رجوعاً"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "البحث ^مجدّداً"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "تكرار البحث الأخير"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 #, fuzzy
 msgid "Find Again ^Backwards"
 msgstr "البحث ر^جوعاً"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 #, fuzzy
 msgid "Repeat the last search in the opposite direction"
 msgstr "تكرار البحث الأخير"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^حدّ العرض"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "تص�ية لائحة الحزم"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "إ^زالة حدّ العرض"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "إزالة التص�ية من لائحة الحزم"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "عثور على ^معطوبة"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "العثور على الحزمة التالية ذات المعتمدات الغير مستو�ية"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 #, fuzzy
 msgid "^Preferences"
 msgstr "يعتمد مسبقاً على"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "خيارات ^واجهة المستخدم"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "تغيير الإعدادات التي تؤثر على واجهة المستخدم"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "إ^دارة المعتمدات"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "تغيير الإعدادات التي تؤثر على كي�ية التعامل مع معتمدات الحزم"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^مت�رقات"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "تغيير إعدادات البرنامج المختل�ة"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^استعادة الخيارات"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "إعادة كل الإعدادات إلى ا�تراضيّات النظام"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^تالي"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "عرض الشاشة التالية"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^سابق"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "عرض الشاشة السابقة"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^إغلاق"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "إغلاق هذه الشاشة"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "^عرض حزم جديد"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "إنشاء عرض حزم ا�تراضي جديد"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "التدقيق بالتو^صيات"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr "عرض الحزم التي نوصيك بتثبيتها، ولكن التي ليست مثبتة حالياً."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "قائمة حزم ^شاملة جديدة"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "عرض جميع الحزم على النظام �ي قائمة واحدة غير مصن�ة"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "مستعر^ض Debtags جديد"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "استعراض الحزم باستخدام بيانات Debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "^مستعرض تصني�ي جديد"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "استعراض الحزم بحسب الصن�"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^حول"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "عرض معلومات حول هذا البرنامج"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^مساعدة"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "عرض المساعدة ال�ورية"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "دليل ال^مستخدم"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "عرض دليل البرنامج الم�صّل"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "أ^خبار"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "عرض التغييرات المهمة التي تمت �ي كل نسخة من"
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^الرخصة"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "أعمال"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "بحث"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "خيارات"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "عروض"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8007,11 +7974,11 @@ msgid ""
 msgstr ""
 "%ls: قائمة  %ls: مساعدة  %ls: خروج  %ls: تحديث  %ls: تحميل/تثبيت/إزالة حزم"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -8042,9 +8009,41 @@ msgstr "عنوان URL لاستخدامه عند تنزيل سجلّات التØ
 msgid "Downloading the changelog of %s"
 msgstr "تنزيل سجل التغيير"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "يمكنك عرض سجلات تغيير حزم دبيان الرسميّة �قط."
+#~ msgid "MISSING TAG"
+#~ msgstr "علامة م�قودة"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "عنوان URL لاستخدامه عند تنزيل سجلّات التغيير"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr "الحزمة %s ليست حزمة دبيان رسميّة، لذا لا يمكن عرض سجل تغييرها."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "تعذر العثور على أيّة حزمة بالاسم \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "تعذر إعراب الصيغة %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "توقع رقم بعد -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "توقع رقم بعد -q=، لكن وجد %s\n"
+
+#, fuzzy
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "يتطلب المعطى -o معطى آخر بالشكل key=value، ولكن وجد %s"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "عجباً: استقبل رمز خير مجهول\n"
+
+#, fuzzy
+#~| msgid "-u and -i may not be specified with a command"
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "لا يمكن تحديد -u و -i مع أمر واحد"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "يمكنك عرض سجلات تغيير حزم دبيان الرسميّة �قط."
 
 #~ msgid "Err "
 #~ msgstr "خطأ "
@@ -8176,11 +8175,6 @@ msgstr "يمكنك عرض سجلات تغيير حزم دبيان الرسميّ
 #~ msgstr "تنزيل سجل التغيير"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "لم يعثر على حل."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "تعذر �تح مل� هيكلة الحزمة %s"
diff --git a/po/ast.gmo b/po/ast.gmo
index d6fa9a1e..c3d231c7 100644
--- a/po/ast.gmo
+++ b/po/ast.gmo
diff --git a/po/ast.po b/po/ast.po
index 13abdef4..7a9ec969 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude 0.4.11.11\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-02-12 15:29+0800\n"
 "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
 "com>\n"
@@ -361,24 +361,10 @@ msgstr ""
 "nun heba podío baxase dende dalgún depósitu definíu nel ficheru sources.list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL pa usar la baxada de rexistros de cambéu"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Esta opción controla la pantilla usada pa baxar rexistros de cambéu dende'l "
-"sitiu Web de Debian. Sólo necesites camudar esto si los rexistros de cambéu "
-"muevense a otra URL distinta."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Visualizar una preview de qué se faerá anantes de facelo"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -386,12 +372,12 @@ msgstr ""
 "Si esta opción ta activa, entós cuando pidas a aptitude que faiga una "
 "instalación, visualizará primero un sumariu de les aiciones que se faerán."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Escaecer qué paquetes son \"nuevos\" al anovar la llista de paquetes"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -400,12 +386,12 @@ msgstr ""
 "paquetes dempués de qu'actualices la llista de paquetes (p. e., calcando "
 "'u')."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Escaecer qué paquetes son \"nuevos\" al instalar o desaniciar paquetes"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -415,13 +401,13 @@ msgstr ""
 "paquetes dempués de que corras una instalación o instales o desanicies "
 "paquetes dende la llinia de comandos."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "Nun visualizar avisos cuando'l primer cambéu ye fechu en mou sólo llectura"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -431,11 +417,11 @@ msgstr ""
 "modifiques l'estáu d'un paquete si nun tienes permisos p'aplicar cambeos al "
 "sistema."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr "Avisar cuando fae una acción privilexiada un usuariu como non root"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -447,11 +433,11 @@ msgstr ""
 "Tendrás la opción de rexistrate como usuariu root y facer l'acción con "
 "privilexos de root."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Ficheru nel que rexistrar acciones"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -463,11 +449,11 @@ msgstr ""
 "carauter tubería ('%B|%b'), el nome sedrá interpretáu como un comandu shell "
 "que sedrá lo que reciba'l rexistru na entrada standard."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Iguar dependencies automáticamente de un paquete cuando ta seleicionáu"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -479,11 +465,11 @@ msgstr ""
 "Esto ye muncho más rápido que'l iguador de dependencies incluyíu, pero puede "
 "producir resultaos inadecuaos o fallar completamente en dalgunes situaciones."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "Iguar paquetes frayaos automáticamente anantes d'instalar o desaniciar"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -495,11 +481,11 @@ msgstr ""
 "iguador de problemes. N'otru casu, aptitude entrugarate por un solución a "
 "les dependencies frayaes."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Instalar paquetes recomendaos automáticamente"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -517,11 +503,11 @@ msgstr ""
 "ta activa, paquetes que son recomendaos por un paquetes instaláu nun sedrá "
 "desaniciáu automaticamente."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Desaniciar paquetes nun usaos automáticamente"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -539,11 +525,11 @@ msgstr ""
 "ta activa, paquetes instalaos automáticamente nun sedrán desaniciaos si son "
 "recomendaos por otru paquete instaláu."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Paquetes qu'enxamás debieren ser desanicios automáticamente"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -553,12 +539,12 @@ msgstr ""
 "como si dalgún paquete instaláu dependiera d'el: enxamás se marcará pa ser "
 "desaniciáu como paquete nun usáu."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Permitir resoluciones de dependenca que rompe paquetes bloqueaos o prohibios"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -580,15 +566,15 @@ msgstr ""
 "automáticamente les dependencies d'un paquete ya selecionáu pa instalación o "
 "actualización, debido al bug apt #470035."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Opciones IU"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Remanando dependencies"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
@@ -692,7 +678,7 @@ msgstr "Nun puede atopase'l paquete fonte pa \"%s\".\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Nun pueden satisfacese les dependencies de compilación: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -701,7 +687,7 @@ msgstr ""
 "Nota: \"%s\", proporciona'l paquete virtual\n"
 "      \"%s\", yá ta instaláu.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -710,7 +696,7 @@ msgstr ""
 "Nota: \"%s\", proporciona'l paquete virtual\n"
 "      \"%s\", yá va a ser instaláu.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -719,17 +705,22 @@ msgstr ""
 "\"%s\" existe na base de datos del paquete, pero nun ye un\n"
 "paquete real y non lu proporciona nengún paquete.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" ye un paquete virtual proporcionáu por:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Tienes d'escoyer ún pa instalar.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "El paquete '%s' nun tien candidatu pa instalación"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -738,65 +729,60 @@ msgstr ""
 "Nota: seleccionando \"%s\" en llugar de'l\n"
 "      paquete virtual \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s yá ta instaláu na versión solicitada (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 #| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s nun ta instaláu anguaño, polo que nun se reinstalará.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 #| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s yá ta instaláu na versión solicitada (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s nun ta instaláu anguaño, polo que nun se reinstalará.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Paquete %s nun ta instaláu, polo que nun se desaniciará\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Paquete %s nun instaláu, nun puede prohibíse un anovamientu\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Paquete %s nun ye anovable, nun puede prohibíse un anovamientu\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Nota: Seleicionando la xera \"%s: %s\" pa instalar\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Sólo puedes especificar una versión de paquete con un comandu 'install' o un "
-"comandu 'forbid-version'.\n"
+"comandu 'forbid-version'"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
+#: src/cmdline/cmdline_action.cc:508
+#, fuzzy
+#| msgid "You can only specify a package archive with an 'install' command.\n"
+msgid "You can only specify a package archive with an 'install' command"
 msgstr ""
 "Sólo puedes especificar un archivu de paquetes con un comandu 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -805,7 +791,7 @@ msgstr ""
 "Nun puede atopase paquete \"%s\", y más de 40\n"
 "paquetes tienen nel so nome \"%s\".\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -814,12 +800,12 @@ msgstr ""
 "Nun puede atopase paquete \"%s\".  Sin embargo, los siguientes\n"
 "paquetes tienen \"%s\" nel so nome:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Nun s'atopa dengún paquete cuyu nome o descripción concase \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -837,7 +823,7 @@ msgstr ""
 "Nun s'atopa nengún paquete coincidente \"%s\".  Sin embargo, los siguientes\n"
 "paquetes tienen \"%s\" na so descripción:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Carauter d'acción incorreutu '%c'\n"
@@ -860,7 +846,7 @@ msgstr "Err"
 msgid "Changelog download failed: %s"
 msgstr "Rexistru de cambeos de %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "Nun puede executase sensible-pager, ¿ye ésti un sistema Debian que furrula "
@@ -868,99 +854,82 @@ msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s nun ye un paquete oficial de Debian, nun puede visualizase'l so rexistru "
-"de cambeos."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Nun puede atopase rexistru de cambéu pa %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 #| msgid "Couldn't find a changelog for %s"
 msgid "Couldn't run pager %s"
 msgstr "Nun puede atopase rexistru de cambéu pa %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: El comandu clean nun toma argumentos\n"
+msgid "The clean command takes no arguments"
+msgstr "El comandu clean nun toma argumentos"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Esborra %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 #| msgid "Unable to look up your home directory, saving to /tmp/function_pkgs!"
 msgid "Unable to lock the download directory"
 msgstr "Nun s'atopó'l to direutoriu home, ¡guardando a /tmp/function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Esborra %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: El comandu autoclean nun toma argumentos\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "El comandu autoclean nun toma argumentos"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Lliberaránse %sB d'espaciu en discu\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Lliberaráse %sB d'espaciu en discu\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operación %s nun válida"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr ""
 "El siguiente patrón del argumentu nun ye esperáu siguiendo a \"keep-all\""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "Nun pueden resolvese de mou seguru delles dependencies, intentalo corriendo "
-"con --full-resolver.\n"
+"con --full-resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Albortar.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "baxar: Tienes qu'especificar al menos un paquete pa baxar\n"
+msgid "download: you must specify at least one package to download"
+msgstr "baxar: Tienes qu'especificar al menos un paquete pa baxar"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Nun puede lleese llista de fontes"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Nun puede atopase un paquete nomáu \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -998,32 +967,23 @@ msgid "[Working]"
 msgstr "[Trabayando]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: ye requeríu al menos un argumentu (el direutoriu\n"
-"nel qu'escribir ficheros).\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Non existe paquete \"%s\""
+"extract-cache-entries: ye requeríu al menos un argumentu (el direutoriu nel "
+"qu'escribir ficheros)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr "Ensin paquetes seleicionaos pol patrón de gueta dau; nada que facer.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: El comandu forget-new nun toma argumentos\n"
+msgid "The forget-new command takes no arguments"
+msgstr "El comandu forget-new nun toma argumentos"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Escaecería que paquetes son nuevos\n"
@@ -1130,17 +1090,17 @@ msgstr "Los siguientes paquetes sedrán anovaos:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Los siguientes paquetes instalaos parcialmente sedrán configuraos:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "¡Los siguientes paquetes ESENCIALES sedrán DESANICIAOS!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Los siguientes paquetes ESENCIALES sedrán FRAYAOS por esta aición:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1149,16 +1109,16 @@ msgstr ""
 "AVISU: ¡Faciendo esta aición dablemente faigas que'l to sistema rompa!\n"
 "         ¡NUN sigas a menos que sepas ESAUTAMENTE qué tas faciendo!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Toi seguru qu'esto ye una permala idega"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Pa siguir, escribe la frase \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1175,7 +1135,7 @@ msgstr ""
 "esto ye lo que quies facer.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1184,7 +1144,7 @@ msgstr ""
 "*** AVISU ***   Inorando les robles incorreutes porque\n"
 "                  %s::CmdLine::Ignore-Trust-Violations ye 'true'!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1197,7 +1157,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr "Sí"
 
@@ -1206,100 +1166,100 @@ msgstr "Sí"
 #. 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr "Non"
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "¿Quies inorar esti avisu y siguir de toes formes?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Pa siguir, introduz \"%s\"; pa encaboxar, introduz \"%s\": "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Entrada nun reconocible. Introduz \"%s\" o \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Los siguientes paquetes son RECOMENDAOS pero NUN s'instalarán:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Los siguientes paquetes sedrán SUXER�OS pero NUN sedrán instalaos:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Dengún paquete sedrá instaláu, anováu, o desaniciáu.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paquetes anovaos, %lu instalaos nuevos, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalaos, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu baxaos de versión, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu a desaniciar y %lu non anovaos.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Necesario garrar %sB/%sB d'archivos. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Necesario garrar %sB d'archivos. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Dempués de desempaquetar usaránse %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Dempués de desempaquetar lliberaránse %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Ensin paquete a amosar -- introduz los nomes de los paquetes na llinia "
 "dempués de '¡'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Calca Volver pa siguir."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Ensin paquetes atopaos -- introduz los nomes de los paquetes na llinia "
 "dempués 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1308,30 +1268,30 @@ msgstr ""
 "Ensin paquetes atopaos -- introduz cero o más raíces pa la gueta seguios del "
 "paquete a justificar.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "siguir cola instalación"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "albortar y colar"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1339,12 +1299,12 @@ msgstr ""
 "amosar información al rodiu d'un o más paquetes; los nomes de los paquetes "
 "deben siguir a la 'i'"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1352,39 +1312,39 @@ msgstr ""
 "amosar los rexistros de cambéu de Debian d'un o más paquetes; los nomes de "
 "paquetes deben siguir a la 'c'"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "camudar la visualización d'información de dependencia"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "camudar la información de cambeos nel tamañu de paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "camudar la información del númberu de versiones"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1392,27 +1352,27 @@ msgstr ""
 "intentando atopar una razón pa instalar un únicu paquete, o desplicar por "
 "qué instalando un paquete instalase otru paquete."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "corriendo'l iguador de dependencies automáticu pa iguar les dependencies "
 "frayaes."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "usar la interface visual completa"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1424,47 +1384,47 @@ msgstr ""
 "paquete (o patrones). L'aición aplicarase a tolos paquetes que tu llistes. "
 "Les siguientes acciones tan disponibles:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' pa instalar paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M' pa instalar paquetes ya inmediatamente marcalos como instalaos "
 "automáticamente"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' pa desaniciar paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' pa purgar paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' pa bloquiar paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':' pa caltener paquetes nel so estáu actual ensin bloquialos"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' pa marcar paquetes como instalaos automáticamente"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' pa marcar paquetes como instalaos manualmente"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "'&BD' pa instalar les dependencies pa construyir d'un paquete."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1472,30 +1432,30 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 #| msgid "Whether the package is automatically installed."
 msgid "'a': the package was automatically installed or removed."
 msgstr "Si'l paquete s'instala automáticamente."
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Comandos:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1503,20 +1463,20 @@ msgstr ""
 "Falló aptitude atopando una solución pa eses dependencies. Puedes resolveles "
 "por ti mesmu a mano o escribiendo 'n' pa colar."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "¿Quies siguir? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Iguar eses dependencies a manu? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Rempuesta nun válida. Por favor, introduz un comandu válidu o '?' p'aida.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1524,7 +1484,7 @@ msgstr ""
 "Introduz un comandu xestor de paquetes (como '+ package' pa instalar un "
 "paquete), 'R' pa iguar dependencies automáticamente o 'N' p'albortar."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1535,7 +1495,7 @@ msgstr ""
 "Información de dependencies sedrá amosada.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1546,7 +1506,7 @@ msgstr ""
 "Información de dependencies nun sedrá amosada.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1557,7 +1517,7 @@ msgstr ""
 "Versiones que sedrán amosaes.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1568,7 +1528,7 @@ msgstr ""
 "Versiones que nun sedrán amosaes.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1579,7 +1539,7 @@ msgstr ""
 "cambeos de tamañu que sedrán amosaos.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1724,6 +1684,11 @@ msgstr ""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Esperábase una versión o \"%s\" dempués \"%s\""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Non existe paquete \"%s\""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1880,7 +1845,7 @@ msgstr ""
 "Yo quiero iguar les dependencies, pero nun fue criáu un iguador de "
 "dependencies."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1910,7 +1875,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Los siguienes comandos tan disponibles"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Ficheru nel qu'escribir l'estáu del iguador: "
 
@@ -1944,7 +1909,7 @@ msgstr ""
 "*** FALLU: Gueta albortada por excepción grave. Puedes siguir\n"
 "           guetando, pero dalgunes soluciones podríen rechazase."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1953,28 +1918,27 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 #| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Nun puede iguar les dependencies pa l'actualización (nun atopada solución)."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 #| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Nun pueden resolvese dependencies pa l'actualización (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "falló iconv so %s.\n"
+msgid "iconv of %s failed"
+msgstr "falló iconv so %s"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "gueta: Debes dar al menos ún términu de gueta\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "gueta: Debes dar al menos ún términu de gueta"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2017,7 +1981,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Los siguientes paquetes tienes dependencies nun satisfeches:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2240,7 +2204,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Proporciona"
 
@@ -2254,15 +2218,9 @@ msgstr "Descripción: "
 msgid "Homepage: "
 msgstr "Páxina d'aniciu: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nun puede llocalizase paquete %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Nun puede interpretase'l patrón %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Nun s'alcontraron paquetes"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2273,14 +2231,13 @@ msgstr "Baxará/instalará/desaniciará paquetes.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Fallu internu, la ordenación nun finó"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Esborrando ficheros baxaos obsoletos"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: El comandu anovar nun toma argumentos\n"
+msgid "The update command takes no arguments"
+msgstr "El comandu anovar nun toma argumentos"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2299,138 +2256,159 @@ msgstr ""
 "%s: mui pocos argumentos; esperabase polo menos un nome d'etiqueta y un "
 "paquete.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Non atopada versión candidata pa %s\n"
+msgid "No candidate version found for %s"
+msgstr "Non atopada versión candidata pa %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Non atopada versión autual o candidata pa %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "Non atopada versión autual o candidata pa %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Nun s'atopó un archivu \"%s\" pal paquete \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Nun s'atopó un archivu \"%s\" pal paquete \"%s\""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Nun pudo atopase una versión \"%s\" pal paquete \"%s\"\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Nun pudo atopase una versión \"%s\" pal paquete \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Fallu internu: ¡pasose a cmdline_find_ver un valor %i nun válidu!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Fallu internu: ¡pasose a cmdline_find_ver un valor %i nun válidu!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr ""
-"Nun puedes especifiar un archivu y una versión pa un paquete a la vez\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Nun puedes especifiar un archivu y una versión pa un paquete a la vez"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't find a changelog for %s"
-msgid "Couldn't find task '%s'"
-msgstr "Nun puede atopase rexistru de cambéu pa %s"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d frayáu [%+d]"
 msgstr[1] "%d frayaos [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d anováu [%+d]"
 msgstr[1] "%d actualizaos [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d nuevu [%+d]"
 msgstr[1] "%d nuevos [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Estáu actual: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "Hai %d paquete nuevu obsoletu."
 msgstr[1] "hai %d paquetes nuevos obsoletos."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "Hai %d paquete nuevu obsoletu: "
 msgstr[1] "Hai %d paquetes nuevos obsoletos: "
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Ensin coma dempués del nome d'etiqueta \"%s\""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nun puede llocalizase paquete %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find task '%s'"
+msgstr "Nun puede atopase rexistru de cambéu pa %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Nota: Seleicionando la xera \"%s: %s\" pa instalar\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Nun puede atopase rexistru de cambéu pa %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 #| msgid "Packages: "
 msgid "Package %s:"
 msgstr "Paquetes: "
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 #| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Paquete Fonte: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 #| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archivu"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
 #| msgid "search: You must provide at least one search term\n"
-msgid "versions: You must provide at least one package selector\n"
+msgid "versions: You must provide at least one package selector"
 msgstr "gueta: Debes dar al menos ún términu de gueta\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2453,7 +2431,7 @@ msgstr "Autual"
 msgid "Candidate"
 msgstr "Candidatu"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Instalar"
 
@@ -2556,22 +2534,19 @@ msgstr "Nun s'atopa una razón pa instalar %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Paquetes que depeden de %s:"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Nun existe paquete nomáu \"%s\"."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Nun se puede interpretar dalgún patrón de comparación"
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
-msgstr ""
-"%s: Esti comandu requier al menos un argumentu (el paquete a guetar).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
+msgstr "%s: Esti comandu requier al menos un argumentu (el paquete a guetar)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2598,11 +2573,11 @@ msgstr "NON SATISFECHO"
 msgid "UNAVAILABLE"
 msgstr "NUN DISPONIBLE"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Etiquetes"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Etiquetes d'Usuariu"
 
@@ -2813,33 +2788,33 @@ msgstr ""
 "llectura; ¡cualisquier cambéu que faigas a los estaos de los paquetes NUN "
 "sedrá remembrarán!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 #| msgid "allow_choices"
 msgid "allowed"
 msgstr "permitir_escoyetes"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "principal"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2915,36 +2890,44 @@ msgstr ""
 "Nivel de gueta nun válidu \"%s\" (non \"conflict\", \"minimum\", o un "
 "enteru)."
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "La cache de paquetes nun ta disponible; nun pueden baxase ya instalar "
 "paquetes."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Fallu internu: nun puede xenerase la llista de paquetes a baxar"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Falló algamar %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Nun pudieron algamase dellos archivos, ¿seique executando aptitude update o "
+"tentando --fix-missing?"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Nun pueden correxise los paquetes nun disponibles"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Falló un paquete al instalar. Intentando recuperalu:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3096,13 +3079,13 @@ msgstr ""
 "\n"
 "Rexistru completu.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 #| msgid "Downloading packages"
 msgid "Filtering packages"
@@ -3218,19 +3201,19 @@ msgstr ""
 "Los ficheros colos índices de paquetes tan dañaos. Ensin Filename: campu pal "
 "paquete %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Rexistru de cambeos de %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 #| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: %s"
 msgstr "Falló al descargar el cambéu de rexistru: %s"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 #| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: unexpected exception."
@@ -3282,28 +3265,29 @@ msgstr "Nun puede criase'l ficheru de salida: fíu salió con estáu %d."
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nun puede interpretase'l patrón %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Construyir la base de datos d'etiquetes"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 #| msgid "No upgrades are available."
 msgid "No tag descriptions are available."
 msgstr "Ensín actualizaciones disponibles."
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 #| msgid "No upgrades are available."
 msgid "No description available for %s."
 msgstr "Ensín actualizaciones disponibles."
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3464,42 +3448,42 @@ msgstr "Xestor de Paquetes Aptitude"
 msgid "_File"
 msgstr "_Ficheru"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Facer toles instalaciones y desaniciaos pendientes"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Comprobar por nueves versiones de paquetes"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Conseñar tolos paquetes anovables que nun ten reteníos pa que seyan anovaos"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Escaecer qué paquetes son \"nuevos\""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Encaboxar toles instalaciones, desaniciaos, bloqueos y anovamientos "
 "pendientes."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Esborrar ficheros de paquete baxaos previamente"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Desaniciar ficheros de paquetes que nun pueden ser baxaos"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Recargar caché de paquetes"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3509,7 +3493,7 @@ msgstr ""
 "Executa 'su' pa convertite n'alministrador; esto reaniciará'l programa, pero "
 "caltendránse les tos preferencies"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Colar del programa"
 
@@ -3517,7 +3501,7 @@ msgstr "Colar del programa"
 msgid "E_dit"
 msgstr "E_ditar"
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Desfacer la cabera operación o grupu d'operaciones sobre los paquetes"
 
@@ -3549,7 +3533,7 @@ msgid "_Help"
 msgstr "_Aida"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr "Dashboard"
 
@@ -3557,19 +3541,19 @@ msgstr "Dashboard"
 msgid "Update"
 msgstr "Anovar"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Paquetes"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "iguador"
 
@@ -3747,7 +3731,7 @@ msgid "Fix Manually"
 msgstr "Igüar Manualmente"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Anovar"
 
@@ -4287,11 +4271,11 @@ msgstr "Instaláu"
 msgid "Reinstall"
 msgstr "Reinstalar"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Baxar de versión"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Desaniciar"
 
@@ -4323,7 +4307,7 @@ msgstr "Tienes de ser root p'anovar la llista de paquetes."
 msgid "Download already running."
 msgstr "Descarga en cursu."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Yá ta n'execución un anovamientu o instalación d'una llista de paquetes."
@@ -4391,41 +4375,41 @@ msgstr "Fallu nel paquete %s"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Entrugando si trocar el ficheru de configuración %s"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Baxando paquetes"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr "Paquetes frayaos"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr "Amosar paquetes frayaos"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr "Resolver les dependencies"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "%d paquete ta frayáu"
 msgstr[1] "%d paquetes tán frayaos"
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr "Ver cambeos"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr "Aplicar cambeos"
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4435,60 +4419,60 @@ msgstr[1] "%d paquetes a instalar"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%d paquete a desaniciar"
 msgstr[1] "%d paquetes a desaniciar"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr "Tamañu Descarga: %sB."
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr "Etiquetes de %s:\n"
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr "Esta carauterística entá nun s'aplica."
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr "Non implementáu"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr "Instalar/Anovar"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr "Purgar"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Caltener"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Retener"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr "Afitar como automáticu"
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr "Afitar a manual"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr "Camudar estáu automáticu"
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4525,7 +4509,7 @@ msgstr "Info"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4569,15 +4553,15 @@ msgstr "%s ta siendo instaláu manualmente."
 msgid "Cache reloading, please wait..."
 msgstr "Caché recargando, por favor espere..."
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr "Guetando..."
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr "Finando vista"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Faciendo vista"
@@ -5308,114 +5292,115 @@ msgstr "Triba d'alliniamientu desconocida '%s'"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 #| msgid "By-name sorting policies take no arguments"
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Les normes d'ordenación por nome nun tomen argumentos"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Nome de norma d'ordenación de llonxitú cero nun válidu"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "'(' Ensin zarrar na descripción de la norma d'ordenación"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Triba de norma d'ordenación nun válida '%s'"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Nun puede decodificase la cadena multibyte dempués de \"%ls\""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Nun puede decodificase cadena de carauteres anchos dempués de \"%s\""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compiláu en %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilador: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Compiláu con:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  versión apt %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  Versión de NCurses: Desconocida\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  Versión de NCurses: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  Versión de libsigc++: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Activáu'l sofitu d'Ept.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Desactiváu'l sofitu d'Ept.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 #| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  versión apt %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 #| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  versión apt %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Desactiváu'l sofitu d'Ept.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 #| msgid "%s %s compiled at %s %s\n"
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s compiláu en %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Qt support disabled.\n"
 msgstr "  Desactiváu'l sofitu d'Ept.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5423,32 +5408,32 @@ msgstr ""
 "\n"
 "Versiones de llibreríes autuales:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  Versión de NCurses: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  Versión de cwidget: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Versión d'Apt: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Mou d'usu: aptitude [-S nome_ficheru] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opciones] <aición> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5457,44 +5442,44 @@ msgstr ""
 "  Aiciones (si nun especifiques nenguna, aptitude entrará en mou):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      -  Instala/actualiza paquetes.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       -  Desanicia paquetes.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge        - Desanicia paquetes xunto colos sos ficheros de "
 "configuración.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Bloquea paquetes.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Desbloquea un paquete.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Marca paquetes como instalaos manualmente.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Desmarca paquetes como instalaos manualmente.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5503,17 +5488,17 @@ msgstr ""
 " forbid-version - Prohíbe a aptitude anovar a una versión específica d'un "
 "paquete.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Baxa les llistes de paquetes nuevos/actualizables.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade      - Realiza una actualización segura.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5523,54 +5508,54 @@ msgstr ""
 "desaniciando\n"
 "                paquetes.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 #| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' pa instalar les dependencies pa construyir d'un paquete."
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Escaez qué paquetes son \"nuevos\".\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Gueta un paquete por nome y/o espresión.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Visualiza información detallada d'un paquete.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Visualiza información detallada d'un paquete\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Desanicia los ficheros de paquetes baxaos.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Desanicia los ficheros de paquetes baxaos obsoletos.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Ver el rexistru de cambeos del paquete.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Baxa los ficheros .deb pa un paquete.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5578,7 +5563,7 @@ msgid ""
 msgstr ""
 " reinstall    - Baxa y (posiblemente) reinstala un paquete ya instaláu.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5589,7 +5574,7 @@ msgstr ""
 "paquete, o\n"
 "                o por qué ún de los paquetes necesita un paquete concretu.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5603,35 +5588,35 @@ msgstr ""
 "                un o más paquetes llevaríen a un conflictu con dicho "
 "paquete.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opciones:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Esti testu d'aida.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 " --gui          Usar la GUI GTK incluso si ta desactivo na configuración.\n"
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr " --gui          Non usar la GUI GTK incluso si ta disponible.\n"
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Esti testu d'aida\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, fuzzy, c-format
 #| msgid ""
 #| " --gui          Use the GTK GUI even if disabled in the configuration.\n"
@@ -5640,23 +5625,23 @@ msgid ""
 msgstr ""
 " --gui          Usar la GUI GTK incluso si ta desactivo na configuración.\n"
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simula les aiciones, pero en realida nun les fae.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr " -d             Sólo baxa paquetes, non instala o desinstala na.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Siempre pide confirmación de les aiciones.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5664,7 +5649,7 @@ msgstr ""
 " -y             Supón que la rempuesta a entrugues simples de la triba sí/"
 "non ye 'sí'.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5674,7 +5659,7 @@ msgstr ""
 "gueta;\n"
 "                ver el manual.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5683,7 +5668,7 @@ msgstr ""
 " -O orde       Especifica como se deben ordenar los resultados de la gueta;\n"
 "               ver el manual.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
@@ -5692,28 +5677,28 @@ msgstr ""
 "de\n"
 "                la gueta.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Intenta iguar paquetes frayaos de mou agresivu.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Amosa qué versiones de los paquetes van a instalase.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             Amosa les dependencies de los paquetes camudaos\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z             Amosa'l cambéu nel tamañu instaláu de cada paquete.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5721,14 +5706,14 @@ msgid ""
 msgstr ""
 " -v             Amosa información extra (puede dase más d'una vegada).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 " -t [distrib]   Afita la distribución dende la que s'instalen los paquetes.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5737,14 +5722,14 @@ msgstr ""
 " -q             Non amosa los indicadores de progresu incrementales nel\n"
 "                mou de llinia de comandos.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o opconf=val  Establez direutamente la opción de configuración nomada "
 "'key'.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5753,78 +5738,78 @@ msgstr ""
 " --with(out)-recommends,\tEspecifica si se traten o non les\n"
 "                recomendaciones como dependencies fuertes.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fnombre     Llee la información d'estáu estendida d'aptitude de "
 "fnombre.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Baxa una nueva llista de paquetes al aniciar.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr ""
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Fae una instalación al aniciar.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Esti aptitude nun tien poderes de Super Xatu.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 msgid "trace"
 msgstr "traza"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 msgid "debug"
 msgstr "debug"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:399
+#: src/main.cc:365
 msgid "info"
 msgstr "info"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 msgid "warn"
 msgstr "avisu"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:405
+#: src/main.cc:371
 msgid "error"
 msgstr "Fallu"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 msgid "fatal"
 msgstr "fatal"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr "off"
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
@@ -5833,77 +5818,58 @@ msgstr ""
 "Nome de nivel de rexistru desconocíu \"%s\" (esperáu \"traza\", \"debug\", "
 "\"info\", \"avisu\", \"fallu\", \"fatal\", o \"off\")."
 
-#: src/main.cc:488
-#, c-format
-msgid "Invalid logger name \"%s\"."
+#: src/main.cc:456
+#, fuzzy, c-format
+#| msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Nome logeáu nun válidu \"%s\"."
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Esperábase un númberu dempués de -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Esperábase un númberu dempués de -q=, garró %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o requier un argumentu de la forma opción=valor, díose %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Ensin coma dempués del nome d'etiqueta \"%s\".\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "RAREZA: Recibiu códigu d'opción desconocíu\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr "ensín sumariu"
 
-#: src/main.cc:1027
+#: src/main.cc:781
 msgid "first-package"
 msgstr "Primer paquete"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr "primer paquete y triba"
 
-#: src/main.cc:1031
+#: src/main.cc:785
 msgid "all-packages"
 msgstr "Tolos paquetes"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr "tolos paquetes coles sos versiones de dependencia"
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5914,42 +5880,36 @@ msgstr ""
 "\"primer paquete\", \"primer paquete y triba\", \"tolos paquetes\", o "
 "\"tolos paquetes con versiones de dependencia\"."
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 #| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Sólo ún de -u ya -i puede ser especificáu\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 #| msgid ""
 #| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "Puede que -u ya -i nun deban especificase nel mou llinia de comandos (p.e, "
 "con 'install')"
 
-#: src/main.cc:1105
-#, fuzzy
-#| msgid "-u and -i may not be specified with a command"
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "Puede que -u ya -i nun deban especificase con un comandu"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Comandu desconocíu \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Comandu desconocíu \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Esceición non xestionada: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5967,7 +5927,7 @@ msgstr "Guetar por: "
 msgid "Search backwards for: "
 msgstr "Guetar p'atrás: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Buscamines"
 
@@ -6182,7 +6142,7 @@ msgstr "Codificación de mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Paquete"
 
@@ -6263,8 +6223,8 @@ msgstr "<N/A>"
 msgid "<none>"
 msgstr "<none>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtual"
@@ -6400,7 +6360,7 @@ msgstr ""
 msgid "Internal error: Default column string is unparsable"
 msgstr "Fallu internu: la columna por defeutu nun ye lleíble"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Xeres"
 
@@ -6557,11 +6517,11 @@ msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 "L'índiz de coincidencia %ls ye abondu llargu; los grupos disponibles son (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PAQUETES ENSIN MARQUES"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6571,10 +6531,6 @@ msgstr ""
 " Esos paquetes nun tán entá clasificaos en debtags, o la base de datos de "
 "debtags nun ta presente (instalar debtags podría correxir esti problema)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "MARCA NON ATOPADA"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Paquete Fonte: "
@@ -7207,7 +7163,7 @@ msgstr "Cargando caché"
 msgid "Really quit Aptitude?"
 msgstr "¿Zarrar dafechu Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Camudar el comportamientu "
 
@@ -7289,7 +7245,7 @@ msgstr ""
 msgid "License"
 msgstr "Llicencia"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Ver los terminos baxo los que puedes copiar y distribuyir aptitude"
 
@@ -7310,7 +7266,7 @@ msgstr "Aida Online"
 msgid "View a brief introduction to aptitude"
 msgstr "Ver una curtia introdución a aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Aida"
 
@@ -7339,7 +7295,7 @@ msgstr "Manual"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Ver una llista de entrugues retrucaes frecuentes"
 
@@ -7381,15 +7337,15 @@ msgstr ""
 "inútiles y puedan esborrase.%n%n¿Quies esborrar esti direutoriu y tol so "
 "conteniu? Si seleiciones \"Non\", nun verás esti mensaxe otra vegada."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Ver el progresu de la baxada de los paquetes"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Baxada Paquetes"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7400,35 +7356,35 @@ msgstr ""
 "%nPaquetes ensin firmar pueden %Bcomprometer la seguridá del sistema%b. Sólo "
 "debieres siguir cola instalación si tas seguru de qué quies.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versión %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Siguir de toes formes"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Albortar Instalación"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Previsualizar la instalación de los paquetes"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Ver y/o axustar les aiciones que se faerán"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Dalgunos paquetes taben frayaos y fueron iguaos:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "¡Ensin solución pa estos problemes de dependencia!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7437,7 +7393,7 @@ msgstr ""
 "¡Escosose'l tiempu tratando de resolver les dependencies (calca \"%s\" pa "
 "intentalo concienzudamente)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7445,19 +7401,19 @@ msgstr ""
 "La instalación/desaniciáu de paquetes requier privilexos d'alministración, "
 "qu'agora mesmo nun tienes. ¿Quies camudar a la cuenta d'alministrador?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Convertise n'alministrador"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Nun convertise n'alministrador"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ensin paquetes planificaos pa instalar, desaniciar o anovar."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7467,19 +7423,19 @@ msgstr ""
 "pueden anovase, pero nun escoyíste anovalos. Escribe \"U\" pa preparar una "
 "actualización."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Anovando llista de paquetes"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Ver el progresu de l'anovamientu de la llista de paquetes"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Anovar Llistes"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7487,23 +7443,23 @@ msgstr ""
 "L'anovamientu de la llista de paquetes requier privilexos d'alministrador, "
 "que tu nun tienes anguaño. ¿Quies camudar a la cuenta d'alministrador?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Pierde'l to tiempu intentando guetar les mines"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Nun ta permitiu llimpiar mientres ta faciendose una baxada"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Desaniciando ficheros baxaos"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Desaniciáronse los ficheros de paquetes baxaos"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7515,11 +7471,11 @@ msgstr ""
 "L'anovamientu de la llista de paquetes requier privilexos d'alministrador, "
 "que tu nun tienes anguaño. ¿Quies camudar a la cuenta d'alministrador?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "El ficheru de caché d'apt nun ta disponible; nun puede autollimpiase"
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7528,7 +7484,7 @@ msgstr ""
 "Desaniciaos los ficheros de paquetes obsoletos baxaos, lliberando %sB "
 "d'espaciu en discu."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7540,123 +7496,123 @@ msgstr ""
 "L'anovamientu de la llista de paquetes requier privilexos d'alministrador, "
 "que tu nun tienes anguaño. ¿Quies camudar a la cuenta d'alministrador?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Nun hai más soluciones."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Nun puede atopase denguna solución a aplicar."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Agotóse'l tiempu al intentar guetar una solución."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Resolver les Dependencies"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Guetar soluciones pa les dependencies nun satisfeches"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Nun puede abrise %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Fallu volcando l'estáu del iguador"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Instalar/desaniciar paquetes"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Anovar llista de paquetes"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Marcar ^actualizable"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Escaecer paquetes nuevos"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Enc^aboxar aiciones pendientes"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Llimpiar la caché de paquetes"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Llimpiar ficheros ^obsoletos"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Recargar caché de paquetes"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Xugar al guetamines"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^Convertise n'alministrador"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Colar"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Desfacer"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Conseñar el paquete seleicionáu anguaño pa instalar o anovar"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Desaniciar"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Conseñar el paquete seleicionáu anguaño pa desaniciar"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Purgar"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Conseñar el paquete seleicionáu anguaño y los sos ficheros de configuración "
 "pa desaniciar"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Caltener"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Encaboxar cualisquier aición nel paquete seleicionáu"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Retener"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7664,11 +7620,11 @@ msgstr ""
 "Encaboxar cualisquier aición nel paquete seleicionáu, y protexelu de futures "
 "actualizaciones"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Conseñar ^Automáticu"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7676,11 +7632,11 @@ msgstr ""
 "Conseñar el paquete seleicionáu como instaláu automáticamente; desaniciaráse "
 "automáticamente si dengún otru paquete depende d'él"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Conseñar ^Manual"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7688,11 +7644,11 @@ msgstr ""
 "Conseñar el paquete seleicionáu como instaláu manualmente; non sedrá "
 "desaniciáu a menos que lo faigas manualmente"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Prohíbir Versiones"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7700,19 +7656,19 @@ msgstr ""
 "Evitar la instalación de la versión candidata del paquete seleicionáu. Les "
 "versiones postreres del paquete instalaránse de la manera usual"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformación"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Mostrar más información acerca del pauqete seleicionáu"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "Rec^orrer Información de paquetes"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7722,60 +7678,60 @@ msgstr ""
 "descripción llarga del paquete, un resume del so estáu de dependencies o un "
 "análisis de por qué necesitase'l paquete."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Rexistru de cambeos"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Amosar el rexistru de cambeos de Debian pal paquete seleicionáu"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Desaminar Solución"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 "Desaminar los problemes de dependencia de la solución seleicionada anguaño"
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Aplicar ^Solución"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Facer les aiciones conteníes na solución seleicionada anguaño."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Solución siguiente"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Seleicionar la siguiente solución a los problemes de dependencia."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^Solución anterior"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Seleicionar la solución anterior a los problemes de dependencia."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^Primer Solución"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Seleicionar la primer solución a los problemes de dependencies."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "Cabera So^lución"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7783,35 +7739,35 @@ msgstr ""
 "Seleicionar la cabera solución a los problemes de dependencies que se "
 "xenerarón fasta agora."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Camudar ^Refugaos"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Camudar ente refugar o non la aición seleicionada."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Camudar ^Aceptada"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Camudar ente aceutar o non l'aición seleicionada."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Ver Oxetivu"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Ver el paquete que sedrá afeutáu pola aición selecionada"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Refugar Frayar ^Bloqueos"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7819,137 +7775,137 @@ msgstr ""
 "refugar toles aiciones que camudarán l'estáu d'un paquete bloqueáu o "
 "qu'instalaríen versiones prohibíes."
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Guetar"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Guetar p'alantre"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "^Guetar p'atrás"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Guetar p'atrás"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "^Atopar Otra Vegada"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Repetir la cabera gueta"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Atopar Otra Vegada p'^Atrás"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Repetir la cabera gueta na direición opuesta"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Llimitar Vista"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Aplicar un filtru a la llista de paquetes"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Non Llimitar Vista"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Desaniciar el fieltru de la llista de paquetes"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Atopar ^Frayáu"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Atopar el paquete siguiente con dependencies nun satisfeches"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Preferencies"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "Opciones ^IU"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Camudar les preferencies qu'afecten a la interface d'usuariu"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "Manexu de ^Dependencies"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Camudar les preferencies qu'afecten a cómo les dependencies del paquete son "
 "manexaes"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Miscelánea"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Camudar diverses preferencies del programa"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Revertir opciones"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Resetear toles configuraciones a les por defeutu del sistema"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Siguiente"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Ver siguiente visualización"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Prev"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Ver visualización previa"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Zarrar"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Zarrar esta visualización"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Nueva ^Vista de Paquete"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Criar una nueva vista de paquete por defeutu"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Auditar ^Recomendaciones"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7957,87 +7913,87 @@ msgstr ""
 "Ver paquetes que son recomendaos qu'instales, pero nun tienes instalaos "
 "anguaño."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Nueva ^Vista de Llista de Paquetes"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Ver tolos paquetes nel sistema nuna llista simple ensin categoríes"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Nuevu Restolador ^Debtags"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Restolar paquetes usando datos Debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Nuevu ^Restolar de categoríes"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Restolar paquetes por categoría"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Tocante a"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Ver información tocante a esti programa"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Aida"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Ver l'aida online"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Manual d'usuariu"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Ver el manual de programa detalláu"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Noticies"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Ver los cambeos importantes fechos en cada versión de "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Llicencia"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Aiciones"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Guetar"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Opciones"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Vistes"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8045,11 +8001,11 @@ msgid ""
 msgstr ""
 "%ls: Menú %ls: Aida %ls: Colar %ls: Anovar %ls: Baxa/Instala/Desanicia Paqs"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "no_key"
 
@@ -8080,9 +8036,52 @@ msgstr "Falló al descargar el cambéu de rexistru: %s"
 msgid "Downloading the changelog of %s"
 msgstr "Baxando Rexistru de Cambeos"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Sólo puedes ver rexistros de cambéu de paquetes oficiales de Debian."
+#~ msgid "MISSING TAG"
+#~ msgstr "MARCA NON ATOPADA"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL pa usar la baxada de rexistros de cambéu"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Esta opción controla la pantilla usada pa baxar rexistros de cambéu "
+#~ "dende'l sitiu Web de Debian. Sólo necesites camudar esto si los rexistros "
+#~ "de cambéu muevense a otra URL distinta."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s nun ye un paquete oficial de Debian, nun puede visualizase'l so "
+#~ "rexistru de cambeos."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Nun puede atopase un paquete nomáu \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Nun puede interpretase'l patrón %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Esperábase un númberu dempués de -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Esperábase un númberu dempués de -q=, garró %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o requier un argumentu de la forma opción=valor, díose %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "RAREZA: Recibiu códigu d'opción desconocíu\n"
+
+#, fuzzy
+#~| msgid "-u and -i may not be specified with a command"
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "Puede que -u ya -i nun deban especificase con un comandu"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr ""
+#~ "Sólo puedes ver rexistros de cambéu de paquetes oficiales de Debian."
 
 #~ msgid "Err "
 #~ msgstr "Err "
@@ -8246,11 +8245,6 @@ msgstr "Sólo puedes ver rexistros de cambéu de paquetes oficiales de Debian."
 #~ msgstr "Baxando Rexistru de cambeos"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Nun s'atopó denguna solución."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Nun puede abrise'l ficheru cola xerarquía de paquetes %s"
diff --git a/po/bs.gmo b/po/bs.gmo
index c434f393..1766c289 100644
--- a/po/bs.gmo
+++ b/po/bs.gmo
diff --git a/po/bs.po b/po/bs.po
index 9d5a009f..8e413645 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2004-05-08 17:40+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -305,69 +305,58 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL koji će se koristiti za preuzimanje changelog datoteka"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Prikaži pregled šta će biti urađeno prije radnje"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Zaboravi koji su paketi \"new\" kada god se ažuriraju liste paketa"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Zaboravi koji su paketi \"new\" kada god se paketi instaliraju ili uklone"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Upozori prilikom pokušaja obavljanja privilegovane akcije od strane "
 "korisnika koji nije root"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -375,11 +364,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Datoteka u koju će se zapisivati akcije"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -387,11 +376,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr ""
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -399,11 +388,11 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -411,11 +400,11 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr ""
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -426,11 +415,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr ""
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -441,22 +430,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -469,16 +458,16 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 #, fuzzy
 msgid "UI options"
 msgstr "Opcije"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr ""
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr ""
 
@@ -583,117 +572,115 @@ msgstr ""
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already installed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already going to be installed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, 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:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr ""
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
 "      virtual package \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr ""
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, 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:560
+#: src/cmdline/cmdline_action.cc:555
 #, 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:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -707,7 +694,7 @@ msgid ""
 "packages contain \"%s\" in their description:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr ""
@@ -729,28 +716,22 @@ msgstr ""
 msgid "Changelog download failed: %s"
 msgstr "Poništi"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr ""
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, c-format
 msgid "Couldn't run pager %s"
 msgstr ""
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
+msgid "The clean command takes no arguments"
 msgstr ""
 
 #: src/cmdline/cmdline_clean.cc:66
@@ -758,68 +739,59 @@ msgstr ""
 msgid "Del %s* %spartial/*\n"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, fuzzy, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "S'alliberaran %sB de l'espai de disc"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, fuzzy, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "S'alliberaran %sB de l'espai de disc"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
+msgid "download: you must specify at least one package to download"
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr ""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -853,30 +825,21 @@ msgid "[Working]"
 msgstr ""
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
-msgstr ""
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
+msgid "The forget-new command takes no arguments"
 msgstr ""
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr ""
@@ -984,33 +947,33 @@ msgstr ""
 msgid "The following partially installed packages will be configured:"
 msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, 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:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1021,14 +984,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  %s::CmdLine::Ignore-Trust-Violations is 'true'!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1039,7 +1002,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1048,200 +1011,200 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, fuzzy, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 #, fuzzy
 msgid "toggle the display of changes in package sizes"
 msgstr "Oblik prikaza za poglede paketa"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1249,48 +1212,48 @@ msgid ""
 "The following actions are available:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 #, fuzzy
 msgid "'+' to install packages"
 msgstr "Automatski nadogradi instalirane pakete"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 #, fuzzy
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 #, fuzzy
 msgid "'&M' to mark packages as automatically installed"
 msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1298,54 +1261,54 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 #, fuzzy
 msgid "Commands:"
 msgstr "Preporu�uje"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1353,7 +1316,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1361,7 +1324,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1369,7 +1332,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1377,7 +1340,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1385,7 +1348,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1505,6 +1468,11 @@ msgstr ""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr ""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr ""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1652,7 +1620,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1681,7 +1649,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Slijedeći paketi su OŠTEĆENI:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr ""
 
@@ -1711,7 +1679,7 @@ msgid ""
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1720,23 +1688,22 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
+msgid "iconv of %s failed"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
 msgstr ""
 
 #: src/cmdline/cmdline_show_broken.cc:81
@@ -1780,7 +1747,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr ""
@@ -2004,7 +1971,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr ""
 
@@ -2018,15 +1985,9 @@ msgstr ""
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr ""
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr ""
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Paketi nisu pronađeni"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2037,13 +1998,12 @@ msgstr ""
 msgid "Internal Error, Ordering didn't finish"
 msgstr ""
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
+msgid "The update command takes no arguments"
 msgstr ""
 
 #: src/cmdline/cmdline_user_tag.cc:65
@@ -2061,134 +2021,154 @@ msgstr "Ukloni zastarjele datoteke paketa nakon preuzimanja nove liste paketa"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
-#, c-format
-msgid "No candidate version found for %s\n"
-msgstr ""
-
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No current or candidate version found for %s\n"
+msgid "No candidate version found for %s"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
+msgid "No current or candidate version found for %s"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:203
-#, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr ""
+#: src/cmdline/cmdline_util.cc:202
+#, fuzzy, c-format
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Ukloni zastarjele datoteke paketa nakon preuzimanja nove liste paketa"
 
-#: src/cmdline/cmdline_util.cc:209
-#, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr ""
+#: src/cmdline/cmdline_util.cc:213
+#, fuzzy, c-format
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Ukloni zastarjele datoteke paketa nakon preuzimanja nove liste paketa"
 
-#: src/cmdline/cmdline_util.cc:239
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:273
-#, c-format
-msgid "Couldn't find task '%s'"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:937
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:966
+#, c-format
+msgid "Couldn't find any package for pattern '%s'"
+msgstr ""
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 #| msgid "Package: "
 msgid "Package %s:"
 msgstr "Paket:"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Paket:"
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 #| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arhiva"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+msgid "versions: You must provide at least one package selector"
 msgstr ""
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2212,7 +2192,7 @@ msgstr ""
 msgid "Candidate"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 #, fuzzy
 msgid "Install"
 msgstr "Automatski nadogradi instalirane pakete"
@@ -2316,20 +2296,18 @@ msgstr ""
 msgid "Packages requiring %s:"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, fuzzy, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Automatski prikazuj zašto su paketi oštećeni"
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 
 #: src/cmdline/cmdline_why.h:212
@@ -2356,11 +2334,11 @@ msgstr ""
 msgid "UNAVAILABLE"
 msgstr ""
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr ""
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr ""
 
@@ -2557,31 +2535,31 @@ msgid ""
 "you make to the states of packages will NOT be preserved!"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2648,34 +2626,40 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2818,13 +2802,13 @@ msgid ""
 "Log complete.\n"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "Paket:"
@@ -2931,19 +2915,19 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, fuzzy, c-format
 msgid "Changelog of %s"
 msgstr "Poništi"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL koji će se koristiti za preuzimanje changelog datoteka"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
@@ -2994,26 +2978,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "URL koji će se koristiti za preuzimanje changelog datoteka"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr ""
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "Automatski nadogradi instalirane pakete"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "Automatski nadogradi instalirane pakete"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3158,43 +3143,43 @@ msgstr ""
 msgid "_File"
 msgstr ""
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 msgid "Restart the program as root; your settings will be preserved"
 msgstr ""
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr ""
 
@@ -3202,7 +3187,7 @@ msgstr ""
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
@@ -3235,7 +3220,7 @@ msgid "_Help"
 msgstr ""
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3243,19 +3228,19 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr ""
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr ""
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr ""
 
@@ -3429,7 +3414,7 @@ msgid "Fix Manually"
 msgstr ""
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr ""
 
@@ -3950,11 +3935,11 @@ msgstr "Automatski nadogradi instalirane pakete"
 msgid "Reinstall"
 msgstr ""
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr ""
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr ""
 
@@ -3987,7 +3972,7 @@ msgstr ""
 msgid "Download already running."
 msgstr "Preuzimam Changelog datoteku"
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
@@ -4048,37 +4033,37 @@ msgstr "Paket:"
 msgid "Asking whether to replace the configuration file %s"
 msgstr ""
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr ""
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "Paket:"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "Paket:"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr ""
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Automatski prikazuj zašto su paketi oštećeni"
 msgstr[1] "Automatski prikazuj zašto su paketi oštećeni"
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "Paket:"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "Paket:"
@@ -4086,7 +4071,7 @@ msgstr "Paket:"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4096,62 +4081,62 @@ msgstr[1] "Automatski nadogradi instalirane pakete"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "Automatski prikazuj zašto su paketi oštećeni"
 msgstr[1] "Automatski prikazuj zašto su paketi oštećeni"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "Preuzimam Changelog datoteku"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "Automatski nadogradi instalirane pakete"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "Automatski nadogradi instalirane pakete"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr ""
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr ""
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr ""
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr ""
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4187,7 +4172,7 @@ msgstr ""
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4233,15 +4218,15 @@ msgstr "Instal·la automàticament els paquets suggerits"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr ""
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr ""
@@ -4900,257 +4885,258 @@ msgstr ""
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr ""
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr ""
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr ""
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr ""
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr ""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr ""
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr ""
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr ""
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr ""
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, fuzzy, c-format
 msgid "  NCurses version %s\n"
 msgstr "Verzija:"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr ""
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "Verzija:"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "Verzija:"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr ""
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
 msgstr ""
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, fuzzy, c-format
 msgid "  NCurses version: %s\n"
 msgstr "Verzija:"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr ""
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, fuzzy, c-format
 msgid "  Apt version: %s\n"
 msgstr "Verzija:"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr ""
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr ""
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr ""
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, fuzzy, c-format
 msgid " remove       - Remove packages.\n"
 msgstr "Paket:"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr ""
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr ""
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, fuzzy, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, fuzzy, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr ""
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr ""
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
 msgstr ""
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr ""
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr ""
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr ""
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr ""
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr ""
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr ""
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr ""
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr ""
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
 msgstr ""
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5158,7 +5144,7 @@ msgid ""
 "                why one or more packages would require the given package.\n"
 msgstr ""
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5167,284 +5153,264 @@ msgid ""
 "                lead to a conflict with the given package if installed.\n"
 msgstr ""
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr ""
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr ""
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr ""
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, fuzzy, c-format
 #| msgid "Prompt for confirmation at exit"
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr "Tražiti potvrdu prilikom izlaska"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
 msgstr ""
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
 msgstr ""
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr ""
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
 msgstr ""
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr ""
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies.\n"
 msgstr ""
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr ""
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr ""
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr ""
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 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:393
+#: src/main.cc:359
 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:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 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:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 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:408
+#: src/main.cc:374
 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:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr ""
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr ""
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr ""
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr ""
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr ""
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 #| msgid "Package: "
 msgid "first-package"
 msgstr "Paket:"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "Paket:"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5452,33 +5418,29 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr ""
 
-#: src/main.cc:1088
+#: src/main.cc:837
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
-msgstr ""
-
-#: src/main.cc:1105
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
+msgid "Unknown command \"%s\""
 msgstr ""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr ""
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5494,7 +5456,7 @@ msgstr ""
 msgid "Search backwards for: "
 msgstr ""
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr ""
 
@@ -5702,7 +5664,7 @@ msgstr ""
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr ""
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr ""
 
@@ -5783,8 +5745,8 @@ msgstr ""
 msgid "<none>"
 msgstr ""
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr ""
@@ -5918,7 +5880,7 @@ msgstr ""
 msgid "Internal error: Default column string is unparsable"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr ""
 
@@ -6044,21 +6006,17 @@ msgstr ""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr ""
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr ""
@@ -6639,7 +6597,7 @@ msgstr ""
 msgid "Really quit Aptitude?"
 msgstr ""
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -6717,7 +6675,7 @@ msgstr ""
 msgid "License"
 msgstr ""
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 
@@ -6738,7 +6696,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr ""
 
@@ -6767,7 +6725,7 @@ msgstr ""
 msgid "FAQ"
 msgstr ""
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr ""
 
@@ -6802,16 +6760,16 @@ msgid ""
 "not see this message again."
 msgstr ""
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr ""
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 #, fuzzy
 msgid "Package Download"
 msgstr "Paket:"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -6819,617 +6777,617 @@ msgid ""
 "what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 #, fuzzy
 msgid "  %S*%N %s [version %s]%n"
 msgstr "Verzija:"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr ""
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 #, fuzzy
 msgid "Abort Installation"
 msgstr "Automatski nadogradi instalirane pakete"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr ""
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr ""
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr ""
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr ""
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 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:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr ""
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr ""
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr ""
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr ""
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr ""
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr ""
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr ""
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr ""
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr ""
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr ""
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr ""
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 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:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr ""
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 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:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr ""
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr ""
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 #, fuzzy
 msgid "^Changelog"
 msgstr "Poništi"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr ""
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr ""
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr ""
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr ""
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr ""
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr ""
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr ""
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr ""
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr ""
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr ""
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr ""
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr ""
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr ""
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr ""
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr ""
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr ""
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr ""
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr ""
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr ""
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr ""
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 #, fuzzy
 msgid "Remove the filter from the package list"
 msgstr "Ukloni zastarjele datoteke paketa nakon preuzimanja nove liste paketa"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr ""
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 #, fuzzy
 msgid "^Preferences"
 msgstr "Unaprijed zavisi"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr ""
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 #, fuzzy
 msgid "Audit ^Recommendations"
 msgstr "Preporu�uje"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr ""
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr ""
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr ""
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr ""
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr ""
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr ""
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr ""
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Oblik prikaza za poglede paketa"
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr ""
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Opcije"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr ""
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr ""
 
@@ -7461,9 +7419,8 @@ msgstr "URL koji će se koristiti za preuzimanje changelog datoteka"
 msgid "Downloading the changelog of %s"
 msgstr "Preuzimam Changelog datoteku"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr ""
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL koji će se koristiti za preuzimanje changelog datoteka"
 
 #, fuzzy
 #~ msgid "Leave the following dependencies unresolved:%n"
diff --git a/po/ca.gmo b/po/ca.gmo
index 7a19e36a..71183e91 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index feef0238..1128a452 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude 0.4.11.9\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:21+0800\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -308,75 +308,64 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL a utilitzar per baixar els registres de canvis"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr ""
 "Mostra una previsualització de les tasques que es duran a terme abans "
 "d'executar-les"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 "Oblida quins paquets són \"nous\" en qualsevol actualització de la llista de "
 "paquets"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Oblida quins paquets són \"nous\" en qualsevol instal·lació o supressió de "
 "paquets"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "No mostris un avís en produir-se la primera modificació en el mode només-"
 "lectura."
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Avisa quan s'intentin realitzar accions privilegiades sense ser superusuari"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -384,11 +373,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Fitxer on registrar les accions"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -396,11 +385,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Resol automàticament les dependències d'un paquet seleccionat"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -408,13 +397,13 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Abans d'iniciar la instal·lació o supressió arregla automàticament els "
 "paquets trencats."
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -422,11 +411,11 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Instal·la automàticament els paquets recomanats"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -437,11 +426,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Suprimeix automàticament els paquets no utilitzats"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -452,23 +441,23 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Permet resolucions de dependències que trenquin retencions o prohibicions"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -481,15 +470,15 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Opcions de l'IU"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Gestió de les dependències"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Variat"
 
@@ -593,7 +582,7 @@ msgstr "No s'ha pogut trobar el paquet font per a «%s».\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "No s'ha pogut satisfer les dependències de construcció: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -602,7 +591,7 @@ msgstr ""
 "Nota: \"%s\", que proveeix el paquet virtual\n"
 "      \"%s\", ja s'ha instal·lat.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -611,7 +600,7 @@ msgstr ""
 "Nota: \"%s\", que proveeix el paquet virtual\n"
 "      \"%s\", ja s'instal·larà.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -620,17 +609,22 @@ msgstr ""
 "el \"%s\" existeix a la base de dades de paquets, però no és un paquet\n"
 "real i no el proporciona cap paquet.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" és un paquet virtual proporcionat per:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "N'heu de seleccionar un a instal·lar.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "El paquet «%s» no té candidat d'instaŀlació"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -639,64 +633,57 @@ msgstr ""
 "Nota: s'està seleccionant \"%s\" en comptes del\n"
 "      paquet virtual \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "La versió sol·licitada (%s) de %s ja està instal·lada\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 #| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "El paquet %s no està instal·lat, no es tornarà a instal·lar.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 #| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "La versió sol·licitada (%s) de %s ja està instal·lada\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "El paquet %s no està instal·lat, no es tornarà a instal·lar.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "El paquet %s no està instal·lat, no se suprimirà\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "El paquet %s no està instal·lat, no es pot prohibir l'actualització\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "El paquet %s no és actualitzable, no es pot prohibir l'actualització\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Nota: s'està seleccionant la tasca \"%s: %s\" per a la instal·lació\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Només podeu especificar una versió de paquet mitjançant una ordre 'install' "
-"o una ordre 'forbid-version'.\n"
+"o una ordre 'forbid-version'"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "En una ordre 'install' només podeu especificar un arxiu.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "En una ordre 'install' només podeu especificar un arxiu"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -705,7 +692,7 @@ msgstr ""
 "No s'ha pogut trobar el paquet \"%s\" i el nom de més\n"
 "de 40 paquets conté \"%s\".\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -714,14 +701,14 @@ msgstr ""
 "No s'ha pogut trobar el paquet \"%s\". Tot i això, el nom dels\n"
 "següents paquets conté \"%s\":\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "No s'ha pogut trobar cap paquet amb un nom o descripció que coincideixi amb "
 "\"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -739,7 +726,7 @@ msgstr ""
 "No s'ha pogut trobar cap paquet que coincideixi amb \"%s\". Tot i això, la\n"
 "descripció dels següents paquets conté \"%s\":\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "El caràcter d'acció '%c' és erroni\n"
@@ -764,41 +751,33 @@ msgstr "Err "
 msgid "Changelog download failed: %s"
 msgstr "El registre de canvis de %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "No es pot executar el sensible-pager, és un sistema Debian en funcionament?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s no és un paquet de Debian oficial, no es pot mostrar el seu registre de "
-"modificacions."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "No s'ha pogut trobar un registre de modificacions de %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 #| msgid "Couldn't find a changelog for %s"
 msgid "Couldn't run pager %s"
 msgstr "No s'ha pogut trobar un registre de modificacions de %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: L'ordre de neteja no admet cap argument\n"
+msgid "The clean command takes no arguments"
+msgstr "L'ordre de neteja no admet cap argument"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Suprimeix %s* %sparcial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 #| msgid "Unable to look up your home directory, saving to /tmp/function_pkgs!"
 msgid "Unable to lock the download directory"
@@ -806,65 +785,56 @@ msgstr ""
 "No s'ha pogut cercar el vostre directori d'usuari, s'està desant a /tmp/"
 "function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Suprimeix %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: L'ordre de neteja automàtica no admet cap argument\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "L'ordre de neteja automàtica no admet cap argument"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "S'alliberaran %sB d'espai en disc\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "S'ha alliberat %sB d'espai en disc\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "L'operació %s no és vàlida"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Hi ha un argument del patró inesperat a continuació de \"keep-all\""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "No s'ha pogut resoldre les dependències de forma segura, proveu a executar-"
-"ho amb --full-resolver.\n"
+"ho amb --full-resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Avorta.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "baixa: heu d'especificar un mínim d'un paquet a baixar\n"
+msgid "download: you must specify at least one package to download"
+msgstr "baixa: heu d'especificar un mínim d'un paquet a baixar"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "No s'ha pogut llegir la llista de fonts"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "No es pot trobar un paquet anomenat \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -906,30 +876,21 @@ msgid "[Working]"
 msgstr "[S'està treballant]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "El paquet «%s» no existeix"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: L'ordre forget-new no admet cap argument\n"
+msgid "The forget-new command takes no arguments"
+msgstr "L'ordre forget-new no admet cap argument"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "S'ignorarà quins paquets són nous\n"
@@ -1038,17 +999,17 @@ msgstr "Els paquets següents s'actualitzaran:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Els paquets parcialment instal·lats següents es configuraran:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Els paquets essencials següents se suprimiran\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Els paquets essencials següents contindran errors arran de l'acció:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1058,16 +1019,16 @@ msgstr ""
 "sistema.\n"
 "      No contineu si no coneixeu exactament el que esteu fent.\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Sóc conscient que no és una bona idea"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Per continuar introduïu la frase \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1084,7 +1045,7 @@ msgstr ""
 "segur.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1093,7 +1054,7 @@ msgstr ""
 "*** Avís ***   S'estan ignorant les violacions de confiança perquè\n"
 "              %s::CmdLine::Ignore-Trust-Violations és «cert».\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1106,7 +1067,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1115,130 +1076,130 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Voleu ignorar l'avís i continuar?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Per continuar introduïu \"%s\"; per abortar introduïu \"%s\": "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "No es reconeix l'entrada. Introduïu \"%s\" o \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Els paquets següents són RECOMANATS però NO s'instal·laran:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Els paquets següents són un SUGGERIMENT però NO s'instal·laran:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "No s'instal·larà, actualitzarà o suprimirà cap paquet.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paquets actualitzats, %lu instal·lats, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu tornats a instal·lar, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualitzats, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu a suprimir i %lu a no actualitzar.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Es necessita obtenir %sB/%sB d'arxius. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Es necessita obtenir %sB d'arxius. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Després del desempaquetat s'utilitzaran %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Després del desempaquetat s'alliberaran %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "No s'ha trobat cap paquet a mostrar -- introduïu els noms dels paquets a la "
 "línia a continuació de 'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Per continuar premeu la tecla de retorn."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "No s'ha trobat cap paquet -- introduïu els noms dels paquets a la línia a "
 "continuació de 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "continua la instal·lació"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "atura i surt"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1246,12 +1207,12 @@ msgstr ""
 "mostra la informació sobre un o més paquets; els noms dels paquets haurien "
 "d'anar a continuació de l'i'"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1259,64 +1220,64 @@ msgstr ""
 "mostra els registres de modificacions de Debian d'un o més paquets; els noms "
 "dels paquets haurien d'anar a continuació de la 'c'"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "commuta la visualització de la informació de dependències"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr ""
 "commuta la visualització de les modificacions des les mides dels paquets"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "commuta la visualització dels números de versió"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "entra a la interfície visual"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1328,47 +1289,47 @@ msgstr ""
 "L'acció s'aplicarà a tots els paquets de la llista. Les accions disponibles "
 "són:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' per instal·lar els paquets"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M' per instal·lar els paquets i immediàtament marcar-los com a instal·lats "
 "automàticament"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' per suprimir els paquets"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' per purgar els paquets"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' per a retenir els paquets"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':' per mantenir l'estat actual dels paquets sense retenir-los"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' per marcar els paquets com a instal·lats automàticament"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' marca els paquets com a instal·lats manualment"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "«&BD» per a instal·lar les dependències de construcció d'un paquet."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1376,55 +1337,55 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 #| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' per marcar els paquets com a instal·lats automàticament"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Ordres:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Esteu segur de voler continuar? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "La resposta no és vàlid. Introduïu una ordre vàlid o '?' per a ajuda.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1435,7 +1396,7 @@ msgstr ""
 "Es mostrarà la informació de les dependències.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1446,7 +1407,7 @@ msgstr ""
 "No es mostrarà la informació de les dependències.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1457,7 +1418,7 @@ msgstr ""
 "Es mostraran les versions.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1468,7 +1429,7 @@ msgstr ""
 "No es mostraran les versions.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1479,7 +1440,7 @@ msgstr ""
 "Es mostraran els canvis de mides.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1616,6 +1577,11 @@ msgstr "S'espera un o més parells paquet/versió a continuació de '%c'"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "S'esperava una versió o «%s» a continuació de «%s»"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "El paquet «%s» no existeix"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1767,7 +1733,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1795,7 +1761,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Es disposa de les ordres següents:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "S'ha produït un error en desar l'estat del sistema de resolució a: "
 
@@ -1828,7 +1794,7 @@ msgid ""
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1837,26 +1803,25 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "No s'han pogut resoldre les dependències! Finalitzant..."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 #| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "No s'han pogut resoldre les dependències per a l'actualització (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "s'ha produït un error en l'iconv de %s.\n"
+msgid "iconv of %s failed"
+msgstr "s'ha produït un error en l'iconv de %s"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "cerca: heu de proporcionar, com a mínim, un terme de cerca\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "cerca: heu de proporcionar, com a mínim, un terme de cerca"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1900,7 +1865,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "No s'han trobat les dependències del paquets següents:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2123,7 +2088,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Proporciona"
 
@@ -2137,15 +2102,9 @@ msgstr "Descripció: "
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "No s'ha pogut ubicar el paquet %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "No s'ha pogut analitzar el patró %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "No s'han trobat paquets"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2156,14 +2115,13 @@ msgstr "Es baixarà/instal·larà/suprimirà paquets.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "S'ha produït un error intern, l'ordre no ha finalitzat"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "S'estan suprimint els fitxers baixats obsolets"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: L'ordre d'actualització no admet cap argument\n"
+msgid "The update command takes no arguments"
+msgstr "L'ordre d'actualització no admet cap argument"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2180,139 +2138,161 @@ msgstr "S'està suprimint l'etiqueta d'usuari «%s» del paquet «%s».\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "No s'ha trobat cap versió candidata per a %s\n"
+msgid "No candidate version found for %s"
+msgstr "No s'ha trobat cap versió candidata per a %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "No s'ha trobat cap versió actual o candidata per a %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "No s'ha trobat cap versió actual o candidata per a %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "No s'ha pogut trobar l'arxiu \"%s\" del paquet \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "No s'ha pogut trobar l'arxiu \"%s\" del paquet \"%s\""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "No s'ha pogut trobar la versió \"%s\" del paquet \"%s\"\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "No s'ha pogut trobar la versió \"%s\" del paquet \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
 msgstr ""
 "S'ha produït un error intern: s'ha passat un valor %i no vàlid a "
-"cmdline_find_ver\n"
+"cmdline_find_ver"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "No podeu especificar un arxiu i una versió per a un paquet\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "No podeu especificar un arxiu i una versió per a un paquet"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't find a changelog for %s"
-msgid "Couldn't find task '%s'"
-msgstr "No s'ha pogut trobar un registre de modificacions de %s"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d trencat [%+d]"
 msgstr[1] "%d trencats [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d actualització [%+d]"
 msgstr[1] "%d actualitzacions [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d nou [%+d]"
 msgstr[1] "%d nous [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Estat actual: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "No s'ha pogut ubicar el paquet %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find task '%s'"
+msgstr "No s'ha pogut trobar un registre de modificacions de %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Nota: s'està seleccionant la tasca \"%s: %s\" per a la instal·lació\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "No s'ha pogut trobar un registre de modificacions de %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 #| msgid "Packages"
 msgid "Package %s:"
 msgstr "Paquets"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 #| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Font del paquet: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 #| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arxiu"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
 #| msgid "search: You must provide at least one search term\n"
-msgid "versions: You must provide at least one package selector\n"
+msgid "versions: You must provide at least one package selector"
 msgstr "cerca: heu de proporcionar, com a mínim, un terme de cerca\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2335,7 +2315,7 @@ msgstr "Actual"
 msgid "Candidate"
 msgstr "Candidat"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Instal·la"
 
@@ -2438,22 +2418,20 @@ msgstr "No s'ha trobat una raó per a instal·lar %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Paquets que depenen de %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "No existeix cap paquet anomenat «%s»."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "No s'ha pogut analitzar alguns patrons de coincidència."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
-"%s: aquesta ordre requereix almenys un argument (el paquet a consultar).\n"
+"%s: aquesta ordre requereix almenys un argument (el paquet a consultar)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2481,11 +2459,11 @@ msgstr "No satisfetes"
 msgid "UNAVAILABLE"
 msgstr "No disponible"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Marcadors"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Marcadors d'usuari"
 
@@ -2695,33 +2673,33 @@ msgstr ""
 "No s'ha pogut blocar el fitxer cau. S'està obrint en mode només-lectura; "
 "qualsevol modificació dels estats dels paquets NO es desarà!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 #| msgid "allow_choices"
 msgid "allowed"
 msgstr "permet_opcions"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "principal"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2788,40 +2766,48 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "La memòria cau de paquets no està disponible; no es poden descarregar i "
 "instal·lar paquets."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 "S'ha produït un error intern, no s'ha pogut generar la llista de paquets a "
 "baixar"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "No s'ha pogut obtenir %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"No es poden baixar alguns arxius, proveu a executar aptitude update o "
+"intenteu-ho amb --fix-missing."
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "No s'ha pogut solucionar els problemes amb els paquets no disponibles"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr ""
 "S'ha produït un error en la instal·lació del paquet. S'està intentant "
 "restablir."
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2973,13 +2959,13 @@ msgstr ""
 "\n"
 "Enregistrament complet.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 #| msgid "Downloading packages"
 msgid "Filtering packages"
@@ -3094,19 +3080,19 @@ msgstr ""
 "Els fitxer d'índex del paquet contenen error. Sene nom de fitxer: camp pel "
 "paquet %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "El registre de canvis de %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL a utilitzar per baixar els registres de canvis"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
@@ -3162,28 +3148,29 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "No s'ha pogut analitzar el patró %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "S'està generant la base de dades de marcadors"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 #| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "No instal·lat"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 #| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "No instal·lat"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3348,43 +3335,43 @@ msgstr ""
 msgid "_File"
 msgstr "Fals"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Realitza totes les instal·lacions i supressions pendents"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Verifica si hi ha noves versions dels paquets"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Marca tots els paquets actualitzables que no estiguin retinguts per a "
 "l'actualització"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Oblida quins paquets són \"nous\""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Cancel·la totes les instal·lacions, supressions, retencions i "
 "actualitzacions pendents."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Suprimeix els fitxers dels paquets prèviament baixats"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Suprimeix els fitxers dels paquets que no es podran tornar a baixar"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Torna a carregar la memòria cau dels paquets"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3394,7 +3381,7 @@ msgstr ""
 "Executeu l'ordre 'su' per ser superusuari; es reiniciarà el programa, però "
 "es mantindran els paràmetres personals."
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Surt del programa"
 
@@ -3402,7 +3389,7 @@ msgstr "Surt del programa"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Desfés l'última operació o grup d'operacions del paquets"
 
@@ -3439,7 +3426,7 @@ msgid "_Help"
 msgstr "Ajuda"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3449,19 +3436,19 @@ msgstr ""
 msgid "Update"
 msgstr "Actualitza la llista"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Paquets"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Previsualització"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Sistema de resolució"
 
@@ -3668,7 +3655,7 @@ msgid "Fix Manually"
 msgstr "Manual"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Actualitza"
 
@@ -4269,11 +4256,11 @@ msgstr "Instal·lat"
 msgid "Reinstall"
 msgstr "Reinstal·la"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Desactualitza"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Suprimeix"
 
@@ -4311,7 +4298,7 @@ msgstr "Aplica un filtre a la llista de paquets"
 msgid "Download already running."
 msgstr "S'està baixant... "
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "La llista de paquets ja s'està actualitzant o instal·lant."
 
@@ -4379,29 +4366,29 @@ msgstr "No hi ha cap paquet trencat."
 msgid "Asking whether to replace the configuration file %s"
 msgstr "No s'ha pogut reemplaçar el %s pel nou fitxer de configuració"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "S'estan baixant les paquets"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "No hi ha cap paquet trencat."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "No hi ha cap paquet trencat."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 #| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Resol les dependències"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 #| msgid "No packages are broken."
 msgid "%d package is broken"
@@ -4409,13 +4396,13 @@ msgid_plural "%d packages are broken."
 msgstr[0] "No hi ha cap paquet trencat."
 msgstr[1] "No hi ha cap paquet trencat."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 #| msgid "%s changes"
 msgid "View changes"
 msgstr "%s modificacions"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 #| msgid "%s changes"
 msgid "Apply changes"
@@ -4424,7 +4411,7 @@ msgstr "%s modificacions"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 #| msgid "%d install"
 #| msgid_plural "%d installs"
@@ -4436,7 +4423,7 @@ msgstr[1] "%d instal·lació"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 #| msgid "failed to remove %s"
 msgid "%d package to remove"
@@ -4444,62 +4431,62 @@ msgid_plural "%d packages to remove"
 msgstr[0] "s'ha produït un error en suprimir %s"
 msgstr[1] "s'ha produït un error en suprimir %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 #| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "MidaBaixada"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 #| msgid "not installed"
 msgid "Not implemented"
 msgstr "no instal·lat"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 #| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Instal·lat"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 #| msgid "^Purge"
 msgid "Purge"
 msgstr "^Purga"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Mantín"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Retín"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 #| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Manual d'usuari"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4544,7 +4531,7 @@ msgstr "no"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4595,19 +4582,19 @@ msgstr "%s; s'instal·larà automàticament"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 #| msgid "Search"
 msgid "Searching..."
 msgstr "Cerca"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 #| msgid "Building view"
 msgid "Finalizing view"
 msgstr "S'està construïnt la vista"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "S'està construïnt la vista"
@@ -5367,116 +5354,117 @@ msgstr "Tipus d'alineació '%s' desconegut"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 #| msgid "By-name sorting policies take no arguments"
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Les polítiques d'ordenació pel nom no precisen de cap argument"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "El nom de la política d'ordenació no és vàlid, està buit"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr ""
 "La descripció de la política d'ordenació conté un '(' que no està tancat"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "El tipus de política d'ordenació '%s' és invàlid"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "No es pot decodificar la cadena multibyte a continuació de \"%ls\""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 "No es pot decodificar la cadena de caràcters llarga a continuació de \"%s\""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilat el %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilador: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Compilat contra:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt versió %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  NCurses versió: desconeguda\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  NCurses versió: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++ versió: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Suport d'ept habilitat\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Suport d'ept inhabilitat\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 #| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt versió %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 #| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt versió %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Suport d'ept inhabilitat\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 #| msgid "%s %s compiled at %s %s\n"
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s compilat el %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Qt support disabled.\n"
 msgstr "  Suport d'ept inhabilitat\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5484,32 +5472,32 @@ msgstr ""
 "\n"
 "Versions actuals de les biblioteques:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  Versió de les NCurses: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  Versió de les cwidget: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Versió de l'apt: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Utilització: aptitude [-S nomfitxer] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opcions] <acció> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5518,44 +5506,44 @@ msgstr ""
 " Accions (si no s'han especificat, l'aptitude entrarà en mode interactiu):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instal·la/actualitza els paquets.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Suprimeix els paquets.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge        - Suprimeix els paquets i els corresponents fitxers de\n"
 "                configuració.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Deixa els paquets retinguts.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Cancel·la l'ordre de retenció d'un paquet.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Marca els paquets com a instal·lats automàticament.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Marca els paquets com a instal·lats manualment.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5564,17 +5552,17 @@ msgstr ""
 " forbid-version - Prohibeix l'actualització a una versió específica d'un "
 "paquet.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Baixa les llistes dels paquets nous/actualitzables.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Realitza una actualització segura.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5583,54 +5571,54 @@ msgstr ""
 " full-upgrade - Realitza una actualització, probablement instal·lant i "
 "suprimint paquets.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 #| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "«&BD» per a instal·lar les dependències de construcció d'un paquet."
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Oblida quins paquets són \"nous\".\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Cerca un paquet pel seu nom i/o expressió.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show       - Mostra informació detallada d'un paquet.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show       - Mostra informació detallada d'un paquet\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Suprimeix els fitxers dels paquets baixats.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Suprimeix els fitxers dels paquets baixats antics.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Visualitza un registre de canvis d'un paquet.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Baixa el fitxer .deb d'un paquet.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5639,7 +5627,7 @@ msgstr ""
 " reinstall    - Descarrega i (possiblament) torna a instal·lar un paquet ja\n"
 "                instal·lat.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5650,7 +5638,7 @@ msgstr ""
 "                paquet, o per què un o més paquets requeriria el paquet "
 "donat.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5662,63 +5650,63 @@ msgstr ""
 "                paquet, o per què un o més paquets requeriria el paquet "
 "donat.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opcions:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Aquest text d'ajuda.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Aquest text d'ajuda\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simula les accions però no les duguis a terme.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr " -d          Baixa els paquets però n'instal·lis o suprimeixis cap.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Pregunta permanentment les confirmacions o accions.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
 " -y             Assumeix que la resposta a les preguntes sí/noo és 'sí'.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5727,7 +5715,7 @@ msgstr ""
 " -F format      Especifica un format per a la visualització dels resultats\n"
 "                de la cerca; fes una ullada al manual.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5736,7 +5724,7 @@ msgstr ""
 " -O ordre       Especifica el mode en que s'han d'ordenar els resultats\n"
 "                de la cerca; fes una ullada al manual.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
@@ -5744,17 +5732,17 @@ msgstr ""
 " -w amplada      Especifica l'amplada de la visualització pel formatat dels\n"
 "                 resultats de la cerca.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f       Intent agressiu de resoldre els errors dels paquets.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V           Mostra les versions dels programes a instal·lar.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -5762,12 +5750,12 @@ msgstr ""
 " -D           Mostra les dependències dels paquets modificats "
 "automàticament.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z     Mostra els canvis de la mida instal·lada per a cada paquet.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5775,7 +5763,7 @@ msgid ""
 msgstr ""
 " -v       Mostra la informació extra. (s'utilitza múltiples vegades).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
@@ -5783,7 +5771,7 @@ msgstr ""
 " -t [versió]   Especifica la versió de llançament de la qual s'haurien\n"
 "               d'instal·lar les paquets.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5792,12 +5780,12 @@ msgstr ""
 " -q            En mode línies d'ordres, suprimeix els indicadors de progrés\n"
 "               incremental.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o clau=val   Defineix directament l'opció de configuració 'clau'.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5807,35 +5795,35 @@ msgstr ""
 "recomanacions\n"
 "                com dependències fortes.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S nomf: Llegeix la informació d'estat estesa de l'aptitude del nom.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u       : Baixa una nova llista de paquets a l'inici.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             Aquest text d'ajuda\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr "-i          : Executa la instal·lació a l'inici.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  L'aptitude no té super poders bovins.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 #| msgid "true"
 msgid "trace"
@@ -5843,13 +5831,13 @@ msgstr "cert"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 #| msgid "no"
 msgid "info"
@@ -5857,13 +5845,13 @@ msgstr "no"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 #| msgid "Err "
 msgid "error"
@@ -5871,7 +5859,7 @@ msgstr "Err "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 #| msgid "false"
 msgid "fatal"
@@ -5879,95 +5867,75 @@ msgstr "fals"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
 #| msgid "Invalid operation %s"
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "L'operació %s no és vàlida"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "S'esperava un número a continuació de -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "S'esperava un número a continuació de -q=, s'ha obtingut %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o precisa d'un argument del tipus clau=valor, s'ha obtingut %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "Rar: s'ha rebut un codi d'opció desconegut\n"
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 #| msgid "Package"
 msgid "first-package"
 msgstr "Paquet"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 #| msgid "All Packages"
 msgid "all-packages"
 msgstr "Tots els paquets"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5975,42 +5943,36 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 #| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Només es pot utilitzar un -u o -i\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 #| msgid ""
 #| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u i -i no es poden utilitzar en el mode de línia d'ordres (ex, amb "
 "'install')"
 
-#: src/main.cc:1105
-#, fuzzy
-#| msgid "-u and -i may not be specified with a command"
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u i -i no s'han d'utilitzar amb una ordre"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Ordre desconeguda \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Ordre desconeguda \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Excepció no detectada: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, fuzzy, c-format
 msgid ""
 "Backtrace:\n"
@@ -6028,7 +5990,7 @@ msgstr "Cerca: "
 msgid "Search backwards for: "
 msgstr "Cerca cap enrere: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Busca mines"
 
@@ -6238,7 +6200,7 @@ msgstr "Codificació de mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 14 30 17 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Paquet"
 
@@ -6319,8 +6281,8 @@ msgstr "<N/A>"
 msgid "<none>"
 msgstr "<cap>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtual"
@@ -6458,7 +6420,7 @@ msgstr ""
 "S'ha produït un error intern: la cadena predeterminada de la columna no es "
 "pot analitzar"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Tasques"
 
@@ -6615,21 +6577,17 @@ msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 "L'índex de coincidència %ls és massa gran; els grups disponibles són (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PAQUETS SENSEMARCADOR"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "MARCADOR ABSENT"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Font del paquet: "
@@ -7273,7 +7231,7 @@ msgstr "S'està carregant la memòria cau"
 msgid "Really quit Aptitude?"
 msgstr "Esteu segur de voler sortir de l'Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Canvia el comportament de l'aptitude"
 
@@ -7356,7 +7314,7 @@ msgstr ""
 msgid "License"
 msgstr "Llicència"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 "Mostra les condicions sota les quals podeu copiar i distribuir el programa"
@@ -7378,7 +7336,7 @@ msgstr "Ajuda en línia"
 msgid "View a brief introduction to aptitude"
 msgstr "Visualitza una breu introducció a l'aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Ajuda"
 
@@ -7407,7 +7365,7 @@ msgstr "Manual"
 msgid "FAQ"
 msgstr "PMF"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Mostra una llista de les preguntes més freqüents"
 
@@ -7450,15 +7408,15 @@ msgstr ""
 "suprimir el directori i tot el seu contingut? Si seleccioneu \"No\" no "
 "tornareu a veure aquest missatge."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Visualitza la progressió de la baixada de paquets"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Descàrrega de paquets"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7470,35 +7428,35 @@ msgstr ""
 "Únicament hauríeu de continuar la instal·lació si n'esteu completament segur."
 "%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "   %S*%N %s [versió %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Continuar"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Aborta la instal·lació"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Previsualització de la instal·lació de paquets"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Visualitza i/o ajusta les accions que es duran a terme"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alguns paquets estaven trencats i s'han arreglat:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "No hi ha solucions per a aquests problemes de dependències!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7507,7 +7465,7 @@ msgstr ""
 "S'ha exhaurit l'interval de temps per resoldre les dependències (premeu \"%s"
 "\" per provar-ho millor)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7516,19 +7474,19 @@ msgstr ""
 "d'administrador,els quals actualment no teniu. Voleu canviar al compte de "
 "superusuari?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Esdevé superusuari"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "No esdevinguis superusuari"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "No s'instal·larà, actualitzarà o suprimirà cap paquet."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7538,19 +7496,19 @@ msgstr ""
 "podrien actualitzar, però no heu escollit fer-ho. Premeu \"U\" per preparar-"
 "ne una actualització."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "S'està actualitzant la llista de paquets"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Visualitza la progressió de l'actualització de la llista de paquets"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Actualitza la llista"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7558,24 +7516,24 @@ msgstr ""
 "El procés d'actualitzar paquets precisa de privilegis d'administrador,els "
 "quals actualment no teniu. Voleu canviar al compte de superusuari?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Perdeu el temps intentant trobar les mines"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 "La tasca de neteja no es pot realitzar quan s'està realitzant una baixada"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "S'estan suprimint els fitxers baixats"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "S'han suprimit els fitxers dels paquets baixats"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7587,13 +7545,13 @@ msgstr ""
 "El procés d'actualitzar paquets precisa de privilegis d'administrador,els "
 "quals actualment no teniu. Voleu canviar al compte de superusuari?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 "El fitxer de la memòria cau de l'apt no està disponible; no es pot netejar "
 "automàticament."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7602,7 +7560,7 @@ msgstr ""
 "S'han suprimit els fitxers obsolets dels paquets descarregats, s'està "
 "alliberant %sB d'espai en disc."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7614,125 +7572,125 @@ msgstr ""
 "El procés d'actualitzar paquets precisa de privilegis d'administrador,els "
 "quals actualment no teniu. Voleu canviar al compte de superusuari?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "No hi ha més solucions."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "No s'ha trobat una solució a aplicar."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "S'ha superat el límit de temps en la cerca d'una solució."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Resol les dependències"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Cerca una solució per a les dependències no resoltes"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "No s'ha pogut obrir %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "S'ha produït un error en volcar l'estat del sistema de resolució"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Instal·la/suprimeix els paquets"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "Act^ualitza la llista de paquets"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Marca com a ^actualitzable"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Oblida els paquets nous"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Canc^el·la pes accions pendents"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "Neteja la memòria ^cau dels paquets"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Neteja els fitxers ^obsolets"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Recarrega la memòria cau dels paquets"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Juga al busca mines"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^Sigues superusuari"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "Su^rt"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Desfés"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Instal·la"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "Senyala els paquets seleccionats per a la corresponent instal·lació o "
 "actualització"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "Sup^rimeix"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Senyala els paquets seleccionats per a la corresponent supressió"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Purga"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Senyala els paquets seleccionats i els fitxers de configuració relacionats "
 "per a la corresponents supressió"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Mantín"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Cancel·la qualsevol acció al paquet seleccionat"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "Re^tín"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7740,11 +7698,11 @@ msgstr ""
 "Cancel·la qualsevol acció al paquet seleccionat i protegeix-lo de futures "
 "actualitzacions"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Marca ^automàtic"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7752,11 +7710,11 @@ msgstr ""
 "Marca els paquets seleccionats com a instal·lats automàticament;\n"
 "se suprimiran automàticament si cap paquet en depèn"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Marca ^manual"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7764,11 +7722,11 @@ msgstr ""
 "Marca els paquets seleccionats com a instal·lats manualment;\n"
 "no se suprimiran si no ho feu vosaltres manualment"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Prohibeix la versió"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7776,79 +7734,79 @@ msgstr ""
 "Prohibeix la instal·lació de la versió candidata del paquet seleccionat;\n"
 "les noves versions del paquet s'instal·laran normalment"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformació"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Mostra més informació dels paquets seleccionats"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "Comm^uta la informació dels paquets"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "Registre de modifi^cacions"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 "Mostra el registre de modificacions de Debian dels paquets seleccionats"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Examina la solució"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Examina la solució seleccionada per als problemes de dependències."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Aplica la ^solució"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Executa les accions definides en la solució seleccionada."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "Solució següe^nt"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Selecciona la següent solució dels problemes de dependències."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "Solució ^anterior"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Selecciona la solució anterior dels problemes de dependències."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^Primera solució"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Selecciona la primera solució dels problemes de dependències."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "^Última solució"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7856,35 +7814,35 @@ msgstr ""
 "Selecciona l'última solució dels problemes de dependències que s'han generat "
 "fins el moment."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Commuta ^rebutjat"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Commuta per rebutjar l'acció seleccionada."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Commuta ^aprovat"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Commuta per aprovar l'acció seleccionada."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Mostra l'objectiu"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Mostra el paquet que es veurà afectat per a l'acció seleccionada"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Rebutja trencar ^retinguts"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7892,137 +7850,137 @@ msgstr ""
 "Rebutja totes les accions que canviarien l'estat de paquets retinguts o "
 "instal·larien versions prohibides"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Cerca"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Cerca endavant"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "C^erca enrere"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Cerca enrere:"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Torna a cerc^ar"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Repeteix l'última cerca"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Cerca de nou cap enrere"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Repeteix l'última cerca en la direcció inversa"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Limita la visualització"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Aplica un filtre a la llista de paquets"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "No limitis la vis^ualització"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Suprimeix el filtre de la llista de paquets"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "C^erca els trencats"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Cerca el següent paquet amb dependències no resoltes"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Preferències"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "Opcions de l'I^U"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Canvia els paràmetres relacionats amb la interfície d'usuari"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "Gestió de les ^dependències"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Canvia els paràmetres que fan referència al mode de gestionar les "
 "dependències dels paquets"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Diversos"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Canvia diversos paràmetres de programa"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Recupera les opcions"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Reinicia tots els paràmetres als predeterminats del sistema"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "Següe^nt"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Mostra la visualització següent"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Anterior"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Mostra la visualització anterior"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "Tan^ca"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Tanca aquesta visualització"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Nova ^vista de paquets"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Crea una nova vista de paquets predeterminada"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Audita les ^recomanacions"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -8030,88 +7988,88 @@ msgstr ""
 "Mostra els paquets recomanats per a la instal·lació que encara no estan "
 "instal·lats."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "^Llista de paquets plana nova"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 "Mostra tots els paquets del sistema en una única llista sense categories"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Marcador de ^Debtags nou"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Navega pels paquets utilitzant les dades dels Debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Na^vegador per categories nou"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Navega pels paquets per categories"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "Qu^ant a"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Mostra la informació sobre aquest programa"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "A^juda"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Mostra la informació en línia"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Manual d'usuari"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Mostra el manual detallat del programa"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "PM^F"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Notícies"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Mostra els canvis més importants introduïts en cada versió de "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Llicència"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Accions"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Cerca"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Opcions"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Vistes"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8120,11 +8078,11 @@ msgstr ""
 "%ls: Menú  %ls: Ajuda  %ls: Surt  %ls: Actualitza  %ls: Descarrega/Instal·la/"
 "Suprimeix"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "s"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -8155,11 +8113,44 @@ msgstr "URL a utilitzar per baixar els registres de canvis"
 msgid "Downloading the changelog of %s"
 msgstr "S'està baixant el registre de canvis"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr ""
-"Només podeu visualitzar els registres de cavis dels paquets oficials de "
-"Debian."
+#~ msgid "MISSING TAG"
+#~ msgstr "MARCADOR ABSENT"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL a utilitzar per baixar els registres de canvis"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s no és un paquet de Debian oficial, no es pot mostrar el seu registre "
+#~ "de modificacions."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "No es pot trobar un paquet anomenat \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "No s'ha pogut analitzar el patró %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "S'esperava un número a continuació de -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "S'esperava un número a continuació de -q=, s'ha obtingut %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o precisa d'un argument del tipus clau=valor, s'ha obtingut %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "Rar: s'ha rebut un codi d'opció desconegut\n"
+
+#, fuzzy
+#~| msgid "-u and -i may not be specified with a command"
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u i -i no s'han d'utilitzar amb una ordre"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr ""
+#~ "Només podeu visualitzar els registres de cavis dels paquets oficials de "
+#~ "Debian."
 
 #~ msgid "Err "
 #~ msgstr "Err "
@@ -8294,11 +8285,6 @@ msgstr ""
 #~ msgstr "S'està baixant el registre de canvis"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "No s'ha trobat cap resolució."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "No s'ha pogut obrir el fitxer de jerarquia del paquet %s"
diff --git a/po/cs.gmo b/po/cs.gmo
index ff5b112e..87e6bd3e 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index b8e0e02c..77086102 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:21+0800\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -356,24 +356,10 @@ msgstr ""
 "archivu zadaného v sources.list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL pro stahování záznamů o změnách"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Tato volba ur�uje šablonu, která se použije pro stažení seznamů změn ze "
-"stránek Debianu. Tuto volbu byste měli měnit jen v případě, že se změní URL "
-"s archivem změn."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Před vlastní akcí zobrazit, co se bude provádět"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -381,12 +367,12 @@ msgstr ""
 "Je-li tato volba povolena, pak se před samotnou (od)instalací balíků zobrazí "
 "přehled akcí, které jsou pro tuto instalaci naplánovány."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Zapomenout seznam „nových“ balíků při každé aktualizaci seznamů balíků"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -395,12 +381,12 @@ msgstr ""
 "klávesou „u“) vymaže seznam nových balíků (tzn. tyto se neobjeví ve skupině "
 "„Nové balíky“, ale v „Nenainstalované balíky“)."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Zapomenout seznam „nových“ balíků při každé (od)instalaci balíků"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -409,12 +395,12 @@ msgstr ""
 "Je-li tato volba povolena, aptitude vymaže seznam nových balíků po každé "
 "instalaci/odinstalaci/aktualizaci balíků."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "Nezobrazovat varování při první změně v režimu pouze pro �tení"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -423,12 +409,12 @@ msgstr ""
 "%BNení-li%b tato volba povolena a nemáte-li potřebná oprávnění ke změně "
 "stavu balíku, aptitude zobrazí varování."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Varovat při pokusu o spuštění privilegované akce jako oby�ejný uživatel"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -440,11 +426,11 @@ msgstr ""
 "balíků pod běžným uživatelem). Nabídne se možnost přepnutí na uživatele root "
 "a provedení dané akce s jeho právy."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Soubor pro zaznamenávání akcí"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -456,11 +442,11 @@ msgstr ""
 "(„%B|%b“), bude zbytek jména interpretován jako příkaz, kterému se souhrn "
 "akcí pošle na standardní vstup."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Při výběru balíku automaticky vyřešit jeho závislosti"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -473,11 +459,11 @@ msgstr ""
 "produkovat nevyhovující výsledky a v některých případech dokonce zcela "
 "selhat."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "Před instalací nebo odstraněním automaticky opravit porušené balíky"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -489,11 +475,11 @@ msgstr ""
 "návrh řešení od řešitele závislostí. V opa�ném případě vás aptitude vyzve k "
 "vyřešení porušených závislostí."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Automaticky instalovat doporu�ené balíky"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -511,11 +497,11 @@ msgstr ""
 "nepoužívané balíky“, nebudou automaticky odstraněny balíky doporu�ované "
 "instalovaným balíkem."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Automaticky odstranit nepoužívané balíky"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -533,11 +519,11 @@ msgstr ""
 "doporu�ené balíky“, nebudou automaticky instalované balíky odstraněny, ani "
 "když je instalovaný balík pouze doporu�uje."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Balíky, které by se nikdy neměly odstranit automaticky"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -547,11 +533,11 @@ msgstr ""
 "závisel nějaký instalovaný balík. To znamená, že nikdy nebudou ozna�eny k "
 "odstranění z důvodu toho, že by byly nepoužívané."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr "Povolit řešení závislostí, které ignoruje podržení a zakázané verze"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -572,15 +558,15 @@ msgstr ""
 "vybrán pro instalaci nebo aktualizaci, bude aptitude stejně ignorovat "
 "podržení (chyba #470035)."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Nastavení zobrazení"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Správa závislostí"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Různé"
 
@@ -689,7 +675,7 @@ msgstr "Nemohu najít zdrojový balík pro „%s“.\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Nemohu uspokojit závislosti pro sestavení: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -698,7 +684,7 @@ msgstr ""
 "Pozn: „%s“, poskytující virtuální balík\n"
 "      „%s“, je již nainstalován.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -707,7 +693,7 @@ msgstr ""
 "Pozn: „%s“, poskytující virtuální balík\n"
 "      „%s“, se již bude instalovat.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -716,17 +702,22 @@ msgstr ""
 "„%s“ existuje v databázi balíků, ale není reálný a\n"
 "žádný balík jej neposkytuje.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "„%s“ je virtuální balík poskytovaný:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Pro instalaci musíte vybrat jeden z nich.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Balík „%s“ nemá kandidáta pro instalaci"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -735,62 +726,55 @@ msgstr ""
 "Pozn: vybírám „%s“ místo\n"
 "      virtuálního balíku „%s“\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s je již nainstalován v požadované verzi (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s není nainstalován, tudíž nebude aktualizován.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr ""
 "%s je již nainstalován v nejnovější verzi, tudíž nebude aktualizován.\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s není nainstalován, tudíž nebude reinstalován.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Balík %s není nainstalován, nebude tedy odstraněn\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Balík %s není nainstalován, nelze tedy zakázat aktualizaci\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Balík %s není aktualizovatelný, nelze tedy zakázat aktualizaci\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Pozn: vybírám pro instalaci úlohu „%s: %s“\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
-"Verzi balíku můžete zadat jen s příkazem „install“ nebo „forbid-version“.\n"
+"Verzi balíku můžete zadat jen s příkazem „install“ nebo „forbid-version“"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Archiv balíku můžete zadat jen s příkazem „install“.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Archiv balíku můžete zadat jen s příkazem „install“"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -799,7 +783,7 @@ msgstr ""
 "Nemohl jsem najít balík „%s“ a více než 40\n"
 "balíků obsahuje „%s“ ve svém názvu.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -808,12 +792,12 @@ msgstr ""
 "Nemohl jsem najít balík „%s“, ale následující balíky\n"
 "obsahují „%s“ ve svém názvu:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Nemohl jsem najít balík, jehož název nebo popis se shoduje s „%s“\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -831,7 +815,7 @@ msgstr ""
 "Nemohl jsem najít balík vyhovující „%s“, ale následující balíky\n"
 "obsahují „%s“ ve svém popisu:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Chybná akce „%c“\n"
@@ -856,100 +840,85 @@ msgstr "Err "
 msgid "Changelog download failed: %s"
 msgstr "Soubor změn %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Nemohu spustit sensible-pager - je tento Debian vůbec funk�ní?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "%s není oficiální debianí balík, nemohu zobrazit jeho seznam změn."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Nemohu nalézt seznam změn balíku %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 #| msgid "Couldn't find a changelog for %s"
 msgid "Couldn't run pager %s"
 msgstr "Nemohu nalézt seznam změn balíku %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: Příkaz clean neakceptuje žádné argumenty\n"
+msgid "The clean command takes no arguments"
+msgstr "Příkaz clean neakceptuje žádné argumenty"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Teoreticky smaže %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 #| msgid "Unable to look up your home directory, saving to /tmp/function_pkgs!"
 msgid "Unable to lock the download directory"
 msgstr "Nemohu najít váš domovský adresář, ukládám do /tmp/function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Smazán %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: Příkaz autoclean neakceptuje žádné argumenty\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Příkaz autoclean neakceptuje žádné argumenty"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Teoreticky by se na disku se uvolnilo %sB\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Na disku se uvolnilo %sB\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Neplatná operace %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Neo�ekávaný vzor následující za „keep-all“"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
-msgstr "Nemohu vyřešit závislosti, zkuste parametr --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
+msgstr "Nemohu vyřešit závislosti, zkuste parametr --full-resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Přerušeno.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "download: musíte zadat alespoň jeden balík ke stažení\n"
+msgid "download: you must specify at least one package to download"
+msgstr "download: musíte zadat alespoň jeden balík ke stažení"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Nemohu �íst seznam zdrojů"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Nemohu najít balík nazvaný „%s“"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -990,32 +959,23 @@ msgid "[Working]"
 msgstr "[Pracuji]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: je vyžadován nejméně jeden argument (adresář,\n"
-"do kterého se mají zapsat soubory).\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Balík „%s“ neexistuje"
+"extract-cache-entries: je vyžadován nejméně jeden argument (adresář, do "
+"kterého se mají zapsat soubory)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr "Zadaným vzorem nebyly vybrány žádné balíky; nemám co dělat.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: Příkaz forget-new neakceptuje žádné argumenty\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Příkaz forget-new neakceptuje žádné argumenty"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Teoreticky by zapomněl, které balíky jsou nové\n"
@@ -1123,17 +1083,17 @@ msgstr "Následující balíky budou aktualizovány:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Následující �áste�ně nainstalované balíky budou zkonfigurovány:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Následující NEZBYTNÉ balíky budou ODSTRANĚNY!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Následující NEZBYTNÉ balíky budou touto akcí PORUŠENY:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1142,16 +1102,16 @@ msgstr ""
 "VAROV�N�: Provedením této akce pravděpodobně poškodíte systém!\n"
 "          Pokud PŘESNĚ nevíte, co děláte, NEPOKRAČUJTE!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Jsem si vědom, že to je špatný nápad"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Pro pokra�ování napište frázi „%s“:\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1168,7 +1128,7 @@ msgstr ""
 "naprosto jisti, že to je to, co opravdu chcete udělat.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1178,7 +1138,7 @@ msgstr ""
 "                  %s::CmdLine::Ignore-Trust-Violations\n"
 "                  je nastavena na hodnotu 'true'!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1192,7 +1152,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr "Ano"
 
@@ -1201,96 +1161,96 @@ msgstr "Ano"
 #. 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr "Ne"
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Chcete ignorovat toto varování a přeze vše pokra�ovat?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Pro pokra�ování zadejte „%s“, pro přerušení „%s“: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Nerozpoznaný vstup. Zadejte bu� „%s“ nebo „%s“.\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Následující balíky jsou DOPORUČENÉ, ale NEBUDOU instalovány:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Následující balíky jsou NAVRHOVANÉ, ale NEBUDOU instalovány:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Žádné balíky se nebudou instalovat, aktualizovat nebo odstraňovat.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu balíků aktualizováno, %lu nově instalováno, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalováno, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu degradováno, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu k odstranění a %lu neaktualizováno.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Potřebuji stáhnout %sB/%sB archivů. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Potřebuji stáhnout %sB archivů. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Po rozbalení bude použito %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Po rozbalení bude uvolněno %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Není co zobrazit -- zadejte názvy balíků na řádek za „i“.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Pro pokra�ování stiskněte Enter."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Žádné balíky nenalezeny -- zadejte názvy balíků na řádek za „c“.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1299,41 +1259,41 @@ msgstr ""
 "Žádné balíky nebyly nalezeny -- zadejte žádný nebo více kořenů hledání "
 "následované balíkem, který se má odůvodnit.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "bude pokra�ovat v instalaci"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "přeruší proces a skon�í"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr "zobrazí informace o balících, jejichž názvy následují za „i“"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1341,39 +1301,39 @@ msgstr ""
 "zobrazí seznamy změn, které provedli správci balíků; názvy balíků uve�te za "
 "„c“"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "zapne/vypne zobrazení informací o závislostech"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "zapne/vypne zobrazení změn ve velikostech balíků"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "zapne/vypne zobrazení verzí balíků"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1381,25 +1341,25 @@ msgstr ""
 "zkusí najít důvod pro instalaci každého balíku, nebo vysvětlí, pro� by "
 "instalace jednoho balíku vedla k instalaci jiného balíku."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr "spustí automatické řešení porušených závislostí."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "vstoupí do plně vizuálního rozhraní"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1410,46 +1370,46 @@ msgstr ""
 "následovaný jedním nebo více názvy balíků nebo vzorů. Akce se provede na "
 "všech zadaných balících. K dispozici jsou následující akce:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "„+“ pro instalaci balíků"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "„+M“ pro instalaci balíků a následné ozna�ení jako instalované automaticky"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "„-“ pro odstranění balíků"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "„_“ pro odstranění balíků i s konfigurací"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "„=“ pro podržení balíků v aktuální verzi"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "„:“ pro ponechání balíků v aktuálním stavu bez permanentního podržení"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "„&M“ pro ozna�ení balíků jako instalované automaticky"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "„&m“ pro ozna�ení balíků jako instalované ru�ně"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "„&BD“ pro instalaci závislostí pro sestavení balíku"
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1457,30 +1417,30 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 #| msgid "Whether the package is automatically installed."
 msgid "'a': the package was automatically installed or removed."
 msgstr "Zda je balík instalovaný automaticky."
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Příkazy:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1488,19 +1448,19 @@ msgstr ""
 "aptitude se nepodařilo najít řešení těchto závislostí. Můžete je bu� vyřešit "
 "ru�ně, nebo skon�it klávesou „n“."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Chcete pokra�ovat? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Vyřešit tyto závislosti ru�ně? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Chybná odpově�. Zadejte platný příkaz nebo „?“ pro nápovědu.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1508,7 +1468,7 @@ msgstr ""
 "Zadejte příkaz pro správu balíků (např. „+ balík“ pro instalaci balíku), „R“ "
 "pro automatické vyřešení závislostí, nebo „N“ pro konec."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1519,7 +1479,7 @@ msgstr ""
 "Informace o závislostech budou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1530,7 +1490,7 @@ msgstr ""
 "Informace o závislostech nebudou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1541,7 +1501,7 @@ msgstr ""
 "Verze budou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1552,7 +1512,7 @@ msgstr ""
 "Verze nebudou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1563,7 +1523,7 @@ msgstr ""
 "Změny velikostí budou zobrazeny.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1706,6 +1666,11 @@ msgstr "O�ekávána alespoň jedna dvojice balík/verze následovaná „%c“"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "O�ekávána verze nebo „%s“ za „%s“"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Balík „%s“ neexistuje"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1859,7 +1824,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr "Chci řešit závislosti, ale žádný řešitel závislostí nebyl vytvořen."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1887,7 +1852,7 @@ msgstr "Kon�ím automatické řešení závislostí a vracím se k ru�nímu ř
 msgid "The following commands are available:"
 msgstr "K dispozici jsou následující příkazy:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Soubor, do kterého zapsat stav řešitele: "
 
@@ -1919,7 +1884,7 @@ msgstr ""
 "*** CHYBA: hledání přerušeno fatální chybou. Můžete pokra�ovat\n"
 "           v hledání, ale některá řešení budou nedostupná."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1928,28 +1893,27 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 #| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Nemohu vyřešit závislosti pro aktualizaci (nebylo nalezeno žádné řešení)."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 #| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Nemohu vyřešit závislosti pro aktualizaci (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "iconv selhal na %s.\n"
+msgid "iconv of %s failed"
+msgstr "iconv selhal na %s"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "hledání: Musíte zadat alespoň jeden hledaný term\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "hledání: Musíte zadat alespoň jeden hledaný term"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1992,7 +1956,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Následující balíky mají nesplněné závislosti:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2215,7 +2179,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Poskytuje"
 
@@ -2229,15 +2193,9 @@ msgstr "Popis: "
 msgid "Homepage: "
 msgstr "Domovská stránka: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nemohu nalézt balík %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Nemohu zpracovat vzor %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Nebyly nalezeny žádné balíky"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2248,14 +2206,13 @@ msgstr "Teoreticky by stáhl/nainstaloval/odstranil balíky.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Vnitřní chyba, výběr neskon�il"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Mažu staré stažené soubory"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: Příkaz update neakceptuje žádné argumenty\n"
+msgid "The update command takes no arguments"
+msgstr "E: Příkaz update neakceptuje žádné argumenty"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2272,43 +2229,36 @@ msgstr "Odebírám uživatelský štítek „%s“ z balíku „%s“.\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr "%s: příliš málo argumentů; o�ekáváno alespoň jméno štítku a balík.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "K balíku %s nebyla nalezena kandidátská verze\n"
+msgid "No candidate version found for %s"
+msgstr "K balíku %s nebyla nalezena kandidátská verze"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "K balíku %s nebyla nalezena aktuální nebo kandidátská verze\n"
+msgid "No current or candidate version found for %s"
+msgstr "K balíku %s nebyla nalezena aktuální nebo kandidátská verze"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Nemohu najít archiv „%s“ balíku „%s“\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Nemohu najít archiv „%s“ balíku „%s“"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Nemohu najít verzi „%s“ balíku „%s“\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Nemohu najít verzi „%s“ balíku „%s“"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Vnitřní chyba: cmdline_find_ver byla předána neplatná hodnota %i!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Vnitřní chyba: cmdline_find_ver byla předána neplatná hodnota %i!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Nemůžete najednou zadat archiv a verzi balíku\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Nemůžete najednou zadat archiv a verzi balíku"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't find a changelog for %s"
-msgid "Couldn't find task '%s'"
-msgstr "Nemohu nalézt seznam změn balíku %s"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
@@ -2316,7 +2266,7 @@ msgstr[0] "%d porušený [%+d]"
 msgstr[1] "%d porušené [%+d]"
 msgstr[2] "%d porušených [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
@@ -2324,7 +2274,7 @@ msgstr[0] "%d aktualizace [%+d]"
 msgstr[1] "%d aktualizace [%+d]"
 msgstr[2] "%d aktualizací [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
@@ -2332,12 +2282,12 @@ msgstr[0] "%d nový [%+d]"
 msgstr[1] "%d nové [%+d]"
 msgstr[2] "%d nových [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Aktuální stav: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
@@ -2345,7 +2295,7 @@ msgstr[0] "Existuje %d nově zastaralý balík."
 msgstr[1] "Existují %d nově zastaralé balíky."
 msgstr[2] "Existuje %d nově zastaralých balíků."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
@@ -2353,61 +2303,90 @@ msgstr[0] "Existuje %d nově zastaralý balík: "
 msgstr[1] "Existují %d nově zastaralé balíky: "
 msgstr[2] "Existuje %d nově zastaralých balíků: "
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Název štítku „%s“ nenásleduje �árka"
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nemohu nalézt balík %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find task '%s'"
+msgstr "Nemohu nalézt seznam změn balíku %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Pozn: vybírám pro instalaci úlohu „%s: %s“\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Nemohu nalézt seznam změn balíku %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 #| msgid "Packages:"
 msgid "Package %s:"
 msgstr "Balíky:"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 #| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Zdrojový balík: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 #| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archiv"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
 #| msgid "search: You must provide at least one search term\n"
-msgid "versions: You must provide at least one package selector\n"
+msgid "versions: You must provide at least one package selector"
 msgstr "hledání: Musíte zadat alespoň jeden hledaný term\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2430,7 +2409,7 @@ msgstr "Aktuální"
 msgid "Candidate"
 msgstr "Kandidát"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Instalovat"
 
@@ -2532,21 +2511,19 @@ msgstr "Nemohu najít důvod pro instalaci %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Balíky vyžadující %s:"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Balík nazvaný „%s“ neexistuje."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Nemohu zpracovat některé vzory."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
-msgstr "%s: tento příkaz vyžaduje nejméně jeden argument (zkoumaný balík).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
+msgstr "%s: tento příkaz vyžaduje nejméně jeden argument (zkoumaný balík)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2573,11 +2550,11 @@ msgstr "NESPLNÄšNO"
 msgid "UNAVAILABLE"
 msgstr "NEDOSTUPN�"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Štítky"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Uživatelské štítky"
 
@@ -2780,33 +2757,33 @@ msgstr ""
 "apt nástroj. Otevírám v režimu pouze pro �tení. Změny, které provedete se "
 "stavem balíků, NEBUDOU uloženy!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 #| msgid "allow_choices"
 msgid "allowed"
 msgstr "povolit možnosti"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "hlavní"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2881,36 +2858,44 @@ msgstr ""
 "Neplatná prohledávací úroveň „%s“ (není „conflict“, „minimum“ ani celé "
 "�íslo)."
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "Vyrovnávací paměť balíků není není dostupná, nemohu tedy balíky stahovat ani "
 "instalovat."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Vnitřní chyba: nemohu vytvořit seznam balíků ke stažení"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Selhalo stažení %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Nelze stáhnout některé archivy. Možná spusťte aptitude update nebo zkuste --"
+"fix-missing?"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Nemohu opravit kvůli nedostupným balíkům"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Instalace balíku selhala. Zkouším obnovit:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr "Nemohu získat systémový zámek! (Možná běží další apt nebo dpkg?)"
@@ -3059,13 +3044,13 @@ msgstr ""
 "\n"
 "Záznam kompletní.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 #| msgid "Downloading packages"
 msgid "Filtering packages"
@@ -3179,19 +3164,19 @@ msgid ""
 msgstr ""
 "Soubory s indexy balíků jsou poškozeny. Chybí pole Filename: pro balík %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Soubor změn %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 #| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: %s"
 msgstr "Nepodařilo se stáhnout seznam změn: %s"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 #| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: unexpected exception."
@@ -3242,28 +3227,29 @@ msgstr "Nelze vytvořit výstupní soubor: potomek skon�il se stavem %d."
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nemohu zpracovat vzor %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Vytvářím databázi štítků"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 #| msgid "No upgrades are available."
 msgid "No tag descriptions are available."
 msgstr "Žádné aktualizace nejsou dostupné."
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 #| msgid "No upgrades are available."
 msgid "No description available for %s."
 msgstr "Žádné aktualizace nejsou dostupné."
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3426,40 +3412,40 @@ msgstr "Správce balíků Aptitude"
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Provede všechny nevyřízené instalace a odstraňování"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Zjistí, zda nejsou k dispozici novější verze balíků"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Ozna�í všechny aktualizovatelné balíky, které nejsou podrženy"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Zapomene, které balíky jsou „nové“"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Zruší všechny naplánované instalace, odstranění, podržení a aktualizace."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Smaže stažené soubory (balíky) z /var/cache/apt"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Smaže soubory, které se již nedají stáhnout"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Znovu na�íst obsah cache"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3469,7 +3455,7 @@ msgstr ""
 "Pro přepnutí na uživatele root spusťte „su“. Tím se program restartuje, ale "
 "všechna nastavení budou zachována"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Ukon�í program"
 
@@ -3477,7 +3463,7 @@ msgstr "Ukon�í program"
 msgid "E_dit"
 msgstr "Úpr_avy"
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Vrátí zpět poslední operaci nebo skupinu operací s balíky"
 
@@ -3508,7 +3494,7 @@ msgid "_Help"
 msgstr "Nápo_věda"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr "Centrum"
 
@@ -3516,19 +3502,19 @@ msgstr "Centrum"
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Balíky"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Náhled"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Řešitel"
 
@@ -3701,7 +3687,7 @@ msgid "Fix Manually"
 msgstr "Opravit ru�ně"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Aktualizovat"
 
@@ -4251,11 +4237,11 @@ msgstr "Nainstalovaný"
 msgid "Reinstall"
 msgstr "Přeinstalovat"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Degradovat"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Odstranit"
 
@@ -4287,7 +4273,7 @@ msgstr "Pro aktualizaci seznamu balíků musíte být root."
 msgid "Download already running."
 msgstr "Stahování již probíhá."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Aktualizace seznamu balíků nebo jejich instalace již probíhá."
 
@@ -4354,23 +4340,23 @@ msgstr "Chyba v balíku %s"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Dotazuji se, zda nahradit konfigura�ní soubor %s"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Stahuji balíky"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr "Porušené balíky"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr "Zobrazit porušené balíky"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr "Vyřešit závislosti"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
@@ -4378,18 +4364,18 @@ msgstr[0] "%d balík je porušen"
 msgstr[1] "%d balíky jsou porušeny"
 msgstr[2] "%d balíků je porušeno"
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr "Zobrazit změny"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr "Provést změny"
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4400,7 +4386,7 @@ msgstr[2] "%d balíků k instalaci"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
@@ -4408,53 +4394,53 @@ msgstr[0] "%d balík k odstranění"
 msgstr[1] "%d balíky k odstranění"
 msgstr[2] "%d balíků k odstranění"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr "Ke stažení: %sB."
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr "Štítky %s:\n"
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr "Tato vlastnost zatím není implementovaná."
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr "Není implementováno"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr "Instalovat/Aktualizovat"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr "Vy�istit"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Ponechat"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Podržet"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr "Nastavit jako instalovaný automaticky"
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr "Nastavit jako instalovaný ru�ně"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr "Přepnout automatický/ru�ní stav"
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4491,7 +4477,7 @@ msgstr "Informace"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4535,15 +4521,15 @@ msgstr "%s je instalován ru�ně"
 msgid "Cache reloading, please wait..."
 msgstr "Cache se nahrává, �ekejte prosím..."
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr "Hledám..."
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr "Dokon�uji pohled"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Sestavuji pohled"
@@ -5268,114 +5254,115 @@ msgstr "Neznámý typ zarovnání „%s“"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 #| msgid "By-name sorting policies take no arguments"
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Řazení podle jména nepoužívá žádné argumenty"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Neplatný název řadícího mechanizmu"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Nepárová „(“ v popisu řadícího mechanizmu"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Neplatný řadící mechanizmus „%s“"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Nemohu dekódovat vícebajtový řetězec za „%ls“"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Nemohu dekódovat řetězec se širokými znaky za „%s“"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s zkompilován %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompilátor: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Zkompilováno proti:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt verze %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  NCurses verze: neznámá\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  NCurses verze %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++ verze: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Podpora Ept povolena.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Podpora Ept zakázána.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 #| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt verze %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 #| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt verze %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Podpora Ept zakázána.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 #| msgid "%s %s compiled at %s %s\n"
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s zkompilován %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Qt support disabled.\n"
 msgstr "  Podpora Ept zakázána.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5383,32 +5370,32 @@ msgstr ""
 "\n"
 "Aktuální verze knihoven:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  NCurses verze: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  cwidget verze: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Apt verze: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Použití: aptitude [-S názsoub] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [volby] <akce> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5417,42 +5404,42 @@ msgstr ""
 "  Akce (pokud nejsou zadány, aptitude spustí interaktivní režim):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instaluje/aktualizuje balíky.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Odstraní balíky.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Odstraní balíky a jejich konfigura�ní soubory.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Ochrání balíky před aktualizací.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Zruší ochranu balíku před aktualizací.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Ozna�í balíky, jako že byly instalovány automaticky.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Ozna�í balíky, jako že byly instalovány ru�ně.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5460,17 +5447,17 @@ msgid ""
 msgstr ""
 " forbid-version - Zakáže aptitude aktualizaci na konkrétní verzi balíku.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Stáhne seznamy nových/aktualizovatelných balíků.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Provede bezpe�nou aktualizaci.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5479,61 +5466,61 @@ msgstr ""
 " full-upgrade - Provede aktualizaci, při které možná (na|od)instaluje "
 "balíky.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 #| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "„&BD“ pro instalaci závislostí pro sestavení balíku"
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Zapomene, které balíky jsou „nové“.\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Hledá balíky podle jména a/nebo výrazu.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Zobrazí podrobné informace o balíku.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Zobrazí podrobné informace o balíku\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Smaže stažené .deb soubory balíků.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Smaže staré stažené .deb soubory balíků.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Zobrazí seznam změn balíku.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Stáhne .deb soubor balíku.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
 msgstr " reinstall    - Stáhne a (možná) přeinstaluje již instalovaný balík.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5543,7 +5530,7 @@ msgstr ""
 " why          - Zobrazí ru�ně instalované balíky, které vyžadují balík,\n"
 "                nebo pro� by jeden �i více balíků vyžadovalo daný balík.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5555,34 +5542,34 @@ msgstr ""
 "                se zadaným balíkem, nebo pro� by jeden �i více balíků\n"
 "                vedlo ke konfliktu s daným balíkem, kdyby byl instalován.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Volby:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Tato nápověda.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr " --gui          Použije GTK GUI, i když je v konfiguraci zakázáno.\n"
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr " --no-gui       Nepoužije GTK GUI, i když je dostupné.\n"
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Tato nápověda\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, fuzzy, c-format
 #| msgid ""
 #| " --gui          Use the GTK GUI even if disabled in the configuration.\n"
@@ -5590,31 +5577,31 @@ msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr " --gui          Použije GTK GUI, i když je v konfiguraci zakázáno.\n"
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Pouze simuluje, nic reálně neprovádí.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Stáhne balíky, ale nic neinstaluje nebo neodstraňuje.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Vždy vyžaduje potvrzení akcí.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
 " -y             Na jednoduché ano/ne otázky odpoví automaticky „ano“.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5622,7 +5609,7 @@ msgid ""
 msgstr ""
 " -F formát      Ur�í formát pro zobrazení výsledků hledání; viz manuál.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5630,35 +5617,35 @@ msgid ""
 msgstr ""
 " -O řazení      Ur�í, jak se mají výsledky hledání seřadit; viz manuál.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w šířka       Ur�í šířku zobrazení výsledků hledání.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Agresivně zkusí opravit porušené balíky.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Zobrazí verze balíků, které se mají instalovat.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             Zobrazí závislosti automaticky změněných balíků.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 " -Z             Zobrazí změnu v instalované velikosti každého balíku.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5666,26 +5653,26 @@ msgid ""
 msgstr ""
 " -v             Zobrazí dodate�né informace. (Můžete zadat několikrát.)\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 " -t [verze]     Vybere verzi Debianu, ze které se mají balíky instalovat.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr " -q             V příkazovém režimu potla�í indikátory postupu.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o klí�=hodn   Nastaví konfigura�ní volbu nazvanou „klí�“.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5694,76 +5681,76 @@ msgstr ""
 " --with(out)-recommends\tNastaví, zda se mají doporu�ené závislosti\n"
 "                brát jako silné závislosti.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S jmsou       Na�te rozšířené stavové informace ze souboru jmsou.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Při startu stáhne nové seznamy balíků.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr ""
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Při startu spustí instalaci.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Tato aptitude nemá schopnosti svaté krávy.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 msgid "trace"
 msgstr "trace"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 msgid "debug"
 msgstr "debug"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:399
+#: src/main.cc:365
 msgid "info"
 msgstr "info"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 msgid "warn"
 msgstr "warn"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:405
+#: src/main.cc:371
 msgid "error"
 msgstr "error"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 msgid "fatal"
 msgstr "fatal"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr "off"
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
@@ -5772,77 +5759,57 @@ msgstr ""
 "Neznámý název logovací úrovně „%s“ (o�ekáváno „trace“, „debug“, „info“, "
 "„warn“, „error“, „fatal“ nebo „off“)."
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, c-format
-msgid "Invalid logger name \"%s\"."
-msgstr "Neplatný název „%s“."
+msgid "Invalid logger name \"%s\""
+msgstr "Neplatný název „%s“"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Za -q= je o�ekáváno �íslo\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Za -q= je o�ekáváno �íslo, zadáno %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o vyžaduje argument ve tvaru klí�=hodnota, zadáno %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Název štítku „%s“ nenásleduje �árka.\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "PODIVNÉ: obdržen kód neznámé volby\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr "no-summary"
 
-#: src/main.cc:1027
+#: src/main.cc:781
 msgid "first-package"
 msgstr "first-package"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr "first-package-and-type"
 
-#: src/main.cc:1031
+#: src/main.cc:785
 msgid "all-packages"
 msgstr "all-packages"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr "all-packages-with-dep-versions"
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5853,40 +5820,34 @@ msgstr ""
 "package“, „first-package-and-type“, „all-packages“ nebo „all-packages-with-"
 "dep-versions“)."
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 #| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Můžete zadat pouze jednu z voleb -u a -i\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 #| msgid ""
 #| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr "-u a -i nemohou být použity v řádkovém módu (např. s „install“)"
 
-#: src/main.cc:1105
-#, fuzzy
-#| msgid "-u and -i may not be specified with a command"
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u a -i nemohou být použity spole�ně s příkazem"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Neznámý příkaz „%s“\n"
+msgid "Unknown command \"%s\""
+msgstr "Neznámý příkaz „%s“"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Neodchycená výjimka: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5904,7 +5865,7 @@ msgstr "Hledat: "
 msgid "Search backwards for: "
 msgstr "Hledat předchozí: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Hledání min"
 
@@ -6114,7 +6075,7 @@ msgstr "Encoding of mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 13 30 17 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Balík"
 
@@ -6195,8 +6156,8 @@ msgstr "<N/A>"
 msgid "<none>"
 msgstr "<žádná>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtuální"
@@ -6330,7 +6291,7 @@ msgstr "Nemohu překódovat formát zobrazení balíků po „%ls“"
 msgid "Internal error: Default column string is unparsable"
 msgstr "Vnitřní chyba: Výchozí řetězec sloupce je nezpracovatelný"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Úlohy"
 
@@ -6485,11 +6446,11 @@ msgstr "Indexy musí být větší nebo rovno 1, ne „%s“"
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "Index %ls je příliš velký; dostupné skupiny jsou (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "BAL�KY BEZ ŠT�TKŮ"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6499,10 +6460,6 @@ msgstr ""
 " Tyto balíky zatím nebyly v debtags zařazeny, nebo databáze štítků zcela "
 "chybí (problém by mohla spravit instalace debtags)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "CHYBĚJ�C� ŠT�TEK"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Zdrojový balík: "
@@ -7122,7 +7079,7 @@ msgstr "Nahrávám cache"
 msgid "Really quit Aptitude?"
 msgstr "Opravdu ukon�it Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Mění chování aptitude"
 
@@ -7202,7 +7159,7 @@ msgstr ""
 msgid "License"
 msgstr "Licence"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Zobrazí podmínky, za kterých můžete aptitude šířit"
 
@@ -7223,7 +7180,7 @@ msgstr "Online nápověda"
 msgid "View a brief introduction to aptitude"
 msgstr "Zobrazí krátký úvod do aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Nápověda"
 
@@ -7252,7 +7209,7 @@ msgstr "Manuál"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Zobrazí seznam �asto kladených otázek"
 
@@ -7293,15 +7250,15 @@ msgstr ""
 "si tento adresář odstranit v�etně jeho obsahu? Zvolíte-li „Ne“, již tuto "
 "hlášku neuvidíte."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Zobrazí průběh stahování balíků"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Stažení Balíků"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7313,35 +7270,35 @@ msgstr ""
 "instalaci byste měli pokra�ovat pouze v případě, že jste si naprosto jisti, "
 "že to je to, co opravdu chcete udělat.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [verze %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Opravdu pokra�ovat"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Přerušit instalaci"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Náhled instalace balíků"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Zobrazí a/nebo upraví akce, které se mají vykonat"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Některé balíky byly porušené, ale již jsou spraveny:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "K těmto závislostním problémům neexistuje řešení!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7350,7 +7307,7 @@ msgstr ""
 "Při hledání řešení vypršel povolený �as (stiskem „%s“ spustíte důkladnější "
 "hledání)."
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7358,19 +7315,19 @@ msgstr ""
 "Instalace/odebrání balíků vyžaduje administrátorská práva, která momentálně "
 "nemáte. Chcete se přepnout na ú�et root?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Stát se rootem"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Nestát se rootem"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Žádné balíky nejsou ozna�eny k instalaci, aktualizaci nebo odstranění."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7380,19 +7337,19 @@ msgstr ""
 "balíky sice mohou být aktualizovány, ale rozhodli jste, že se nemají "
 "aktualizovat. Aktualizaci můžete připravit klávesou „U“."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Aktualizuji seznamy balíků"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Zobrazí průběh aktualizace seznamu balíků"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Aktualizace seznamu"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7400,23 +7357,23 @@ msgstr ""
 "Aktualizace seznamu balíků vyžaduje administrátorská práva, která momentálně "
 "nemáte. Chcete se přepnout na ú�et root?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Ukrátit �as hledáním min."
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Čištění během stahování není dovoleno"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Mažu stažené soubory"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Stažené balíky byly smazány"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7428,19 +7385,19 @@ msgstr ""
 "Aktualizace seznamu balíků vyžaduje administrátorská práva, která momentálně "
 "nemáte. Chcete se přepnout na ú�et root?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 "Vyrovnávací paměť balíků není není dostupná; nemohu automaticky �istit."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Staré stažené balíky byly smazány, což uvolnilo %sB místa na disku."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7452,122 +7409,122 @@ msgstr ""
 "Aktualizace seznamu balíků vyžaduje administrátorská práva, která momentálně "
 "nemáte. Chcete se přepnout na ú�et root?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Žádná další řešení."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Nemohu najít řešení, které bych mohl aplikovat."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Při hledání řešení vypršel povolený �as."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Řešení závislostí"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Hledá řešení nesplněných závislostí"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Nemohu otevřít %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Chyba při ukládání stavu řešitele"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Instalovat/odstranit balíky"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Aktualizovat seznam balíků"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Ozna�it aktualizovatelné"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Zapomenout nové balíky"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Zrušit naplánované akc^e"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "Vy�istit ^cache s balíky"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Vy�istit staré s^oubory"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "Znovu na�íst cache"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "Zahrát si minové ^pole"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Stát se rootem"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "Konec"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Zpět"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Instalovat"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Ozna�í aktuálně vybraný balík pro instalaci nebo aktualizaci"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "Odst^ranit"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Ozna�í aktuálně vybraný balík pro odstranění"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "Vy�istit"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Ozna�í aktuálně vybraný balík pro odstranění v�etně konfigura�ních souborů"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "Ponechat"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Na vybraném balíku zruší veškeré akce"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "Přidržet"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7575,11 +7532,11 @@ msgstr ""
 "Na vybraném balíku zruší veškeré akce a ochrání jej před budoucími "
 "aktualizacemi."
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Spravovat ^automaticky"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7587,11 +7544,11 @@ msgstr ""
 "Ozna�í vybraný balík, jako instalovaný automaticky; pokud na něm nebudou "
 "záviset jiné balíky, bude automaticky odstraněn."
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Spravovat ru�ně"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7599,11 +7556,11 @@ msgstr ""
 "Ozna�í vybraný balík, jako by byl nainstalován ru�ně; takový balík nebude "
 "odstraněn, dokud jej neodstraníte sami"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "Zakázat ^verzi"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7611,19 +7568,19 @@ msgstr ""
 "Zakáže, aby se nainstalovala kandidátská verze balíku; novější verze balíku "
 "se budou instalovat jako obvykle"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformace"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Pro vybraný balík zobrazí další informace"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "Přepnout informa^ce o balíku"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7632,93 +7589,93 @@ msgstr ""
 "Přepíná informa�ní oblast mezi různými režimy: umí zobrazit podrobný popis "
 "balíku, stav jeho závislostí, případně důvod, pro� je daný balík vyžadovaný."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "Seznam změn"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "U vybraného balíku zobrazí seznam změn provedených správcem balíku"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "Prozkoumat ř^ešení"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Prozkoumá aktuálně vybrané řešení problémů se závislostmi."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Použít řešení"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Provede akce obsažené v aktuálně vybraném řešení."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "Další řeše^ní"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Vybere další řešení závislostních problémů."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^Předchozí řešení"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Vybere předchozí řešení závislostních problémů."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "První řešení"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Vybere první řešení závislostních problémů."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "Pos^lední řešení"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "Vybere zatím poslední vytvořené řešení závislostních problémů."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Přepnout zamítnutí"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Přepne, zda je aktuálně vybraná akce zamítnutá."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Přepnout povolení"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Přepne, zda je aktuálně vybraná akce povolená."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "Zobrazit cíl"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Zobrazí balí�ek, který bude ovlivněn vybranou akcí."
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Zamítnout porušující podržení"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7726,135 +7683,135 @@ msgstr ""
 "Zamítne všechny akce, které by změnily stav podržených balíků, nebo by "
 "nainstalovaly zakázané verze."
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "Hledat"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Hledá směrem vpřed"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "Hledat předchozí"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Hledá směrem vzad"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Hledat znovu"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Zopakuje poslední hledání"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Hledat znovu obráceně"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Zopakuje poslední hledání v opa�ném směru"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "Omezit zobrazení"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Na seznam balíků aplikuje výběrový filtr"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "Zrušit omezení"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Odstraní filtr aplikovaný na seznam balíků"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Hledat porušené"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Hledá další balík s nesplněnými závislostmi"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Předvolby"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "Nastavení zobrazení"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Změní nastavení, která ovlivňují uživatelské rozhraní"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "Správa závislostí"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Změní nastavení, která ovlivňují způsob řešení závislostí"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "Různé"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Změní ostatní nastavení programu"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "Původní nastavení"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Vrátí všechna nastavení do původního stavu"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "Další"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Zobrazí další pohled"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Předchozí"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Zobrazí předchozí pohled"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "Zavřít"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Zavře tento pohled"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "No^vý pohled na balíky"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Vytvoří nový standardní pohled na balíky"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Prověřit dopo^ru�ení"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7862,87 +7819,87 @@ msgstr ""
 "Zobrazí balíky, které jsou doporu�eny k instalaci, ale které momentálně "
 "nejsou nainstalované."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Nový plochý seznam balíků"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Zobrazí všechny balíky v systému v jediném neroztříděném seznamu"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Nový prohlíže� ^Debtags"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Prohlíží balíky podle dat klasifika�ního systému Debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Nový prohlíže� kategorií"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Prohlíží balíky podle kategorií"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "O progr^amu"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Zobrazí informace o programu"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "Nápověda"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Zobrazí on-line nápovědu"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "Uživatelský ^manuál"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Zobrazí podrobný manuál tohoto programu"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Novinky"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Zobrazí důležité změny mezi jednotlivými verzemi "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licence"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Akce"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Hledat"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Volby"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Pohledy"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7951,11 +7908,11 @@ msgstr ""
 "%ls: Menu  %ls: Nápověda  %ls: Konec  %ls: Aktualizace  %ls: Stažení/"
 "Instalace"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -7986,9 +7943,49 @@ msgstr "Nepodařilo se stáhnout seznam změn: %s"
 msgid "Downloading the changelog of %s"
 msgstr "Stahují se změny"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Můžete prohlížet seznamy změn pouze u oficiálních debianích balíků."
+#~ msgid "MISSING TAG"
+#~ msgstr "CHYBĚJ�C� ŠT�TEK"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL pro stahování záznamů o změnách"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Tato volba ur�uje šablonu, která se použije pro stažení seznamů změn ze "
+#~ "stránek Debianu. Tuto volbu byste měli měnit jen v případě, že se změní "
+#~ "URL s archivem změn."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr "%s není oficiální debianí balík, nemohu zobrazit jeho seznam změn."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Nemohu najít balík nazvaný „%s“"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Nemohu zpracovat vzor %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Za -q= je o�ekáváno �íslo\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Za -q= je o�ekáváno �íslo, zadáno %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o vyžaduje argument ve tvaru klí�=hodnota, zadáno %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "PODIVNÉ: obdržen kód neznámé volby\n"
+
+#, fuzzy
+#~| msgid "-u and -i may not be specified with a command"
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u a -i nemohou být použity spole�ně s příkazem"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Můžete prohlížet seznamy změn pouze u oficiálních debianích balíků."
 
 #~ msgid "Err "
 #~ msgstr "Err "
@@ -8159,11 +8156,6 @@ msgstr "Můžete prohlížet seznamy zmÄ›n pouze u oficiálních debianích balÃ
 #~ msgstr "Stahuji Changelog"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Žádné řešení nebylo nalezeno."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Nemohu otevřít soubor s hierarchií balíků %s"
diff --git a/po/da.gmo b/po/da.gmo
index 906be324..ac25e866 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 069d2c8d..97a5f1fd 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude 0.6.3-3.2\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:22+0800\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -374,24 +374,10 @@ msgstr ""
 "filen."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL som ændringslogs skal hentes fra"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Her angives hvilken adresse ændringslogfiler skal hentes fra på Debians "
-"website. Du behøver kun at ændre denne hvis ændringslogfilerne flytter til "
-"en anden adresse."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Lav en forhåndsoversigt over hvad der vil blive gjort, før det gøres"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -400,12 +386,12 @@ msgstr ""
 "installeringskørsel, først blive vist et sammendrag af de handlinger "
 "aptitude vil udføre."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Glem hvilke pakker der er \"nye\" når pakkelisterne opdateres"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -413,13 +399,13 @@ msgstr ""
 "Hvis denne indstilling er valgt, vil aptitude rydde listen over nye pakker, "
 "efter en opdatering af pakkelisterne (f.eks. ved at taste \"u\")."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Glem hvilke pakker der er \"nye\", når pakker installeres eller afinstalleres"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -429,14 +415,14 @@ msgstr ""
 "efter en installeringskørsel, eller hvis pakker installeres/afinstalleres "
 "fra kommandolinjen."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "Vis ikke en advarsel når den første ændring er lavet i skrivebeskyttet "
 "tilstand"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -446,11 +432,11 @@ msgstr ""
 "du ændrer en pakkes status, såfremt du ikke har tilladelse til at foretage "
 "denne ændring."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr "Advar når en alm. bruger forsøger handling der kræver root-rettigheder"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -462,11 +448,11 @@ msgstr ""
 "pakker som alm. bruger. Du vil få mulighed for at logge ind som root og "
 "gennemføre handlingen med rettigheder som administrator."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Fil som handlinger skal logges i"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -478,11 +464,11 @@ msgstr ""
 "filnavnet er et rør (\"%B|%b\"), vil resten af navnet blive opfattet som en "
 "skalkommando der vil modtage loggen på standardinddata."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Udred en pakkes afhængigheder automatisk når den vælges"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -495,11 +481,11 @@ msgstr ""
 "afhængighedsudreder, men kan til gengæld give mindre gode resultater, eller "
 "helt mislykkes i visse tilfælde."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "Reparér brudte afhængigheder autm. før installering/afinstallering"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -511,11 +497,11 @@ msgstr ""
 "automatisk anvende afhængighedsudrederens aktuelle forslag. I modsat fald "
 "vil aptitude bede dig om at angive en løsning på de brudte afhængigheder."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Installér anbefalede pakker automatisk"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -534,11 +520,11 @@ msgstr ""
 "pakker automatisk\" også er valgt, vil pakker der anbefales af en "
 "installeret pakke, ikke automatisk blive afinstalleret."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Afinstallér ubrugte pakker automatisk"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -556,11 +542,11 @@ msgstr ""
 "pakker automatisk\", også er valgt, så vil ingen automatisk installerede "
 "pakker blive afinstalleret, hvis de anbefales af nogen installeret pakke."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Pakker som aldrig skal afinstalleres automatisk"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -570,11 +556,11 @@ msgstr ""
 "installeret pakke afhænger af dem: de vil dermed aldrig blive udvalgt til "
 "afinstallering som ubrugte pakker."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr "Tillad at udredning af afhængigheder bryder med tilbageholdte/forbudte"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -596,15 +582,15 @@ msgstr ""
 "afhængigheder for pakke som netop er blevet valgt til installering eller "
 "opgradering, pga. programfejl #470035 i apt."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Indstillinger for brugergrænseflade"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Håndtering af afhængigheder"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Diverse"
 
@@ -708,7 +694,7 @@ msgstr "Kunne ikke finde kildearkivs-pakke for \"%s\".\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Kan ikke opfylde pakkebygnings-afhængigheder: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -717,7 +703,7 @@ msgstr ""
 "Bemærk: \"%s\", som giver den virtuelle pakke\n"
 "        \"%s\", er allerede installeret.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -726,7 +712,7 @@ msgstr ""
 "Bemærk: \"%s\", som giver den virtuelle pakke\n"
 "        \"%s\", er allerede valgt til installering.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -735,17 +721,22 @@ msgstr ""
 "\"%s\" eksisterer i pakkedatabasen, men den er ikke en\n"
 "rigtig pakke og den gives ikke af nogen pakke.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" er en virtuel pakke som gives af:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Du skal vælge at installere en.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Pakken »%s« har ingen installationskandidat"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -754,17 +745,17 @@ msgstr ""
 "Bemærk: vælger \"%s\" i stedet for\n"
 "        den virtuelle pakke \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s er allerede installeret i den ønskede version (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s er aktuelt ikke installeret, så den vil ikke blive opgraderet.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
@@ -772,47 +763,40 @@ msgstr ""
 "%s er allerede installeret i den nyeste version, så den vil ikke blive "
 "opgraderet.\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 "%s er aktuelt ikke installeret, så den vil ikke blive geninstalleret.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Pakke %s er ikke installeret, så den vil ikke blive afinstalleret\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pakke %s er ikke installeret, kan ikke forbyde en opgradering\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Pakke %s er ikke opgradérbar, kan ikke forbyde en opgradering\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Bemærk: vælger opgavepakken \"%s: %s\" til installering\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Man kan kun angive en pakkeversion med kommandoerne \"install\" eller "
-"\"forbid-version\"\n"
+"\"forbid-version\""
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Man kan kun angive et pakkearkiv med kommandoen \"install\".\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Man kan kun angive et pakkearkiv med kommandoen \"install\""
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -821,7 +805,7 @@ msgstr ""
 "Kunne ikke finde pakke \"%s\" og mere end 40\n"
 "pakker som har \"%s\" i deres navn.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -830,13 +814,13 @@ msgstr ""
 "Kunne ikke finde pakken \"%s\". Men følgende\n"
 "pakker har \"%s\" i deres navn:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Kunne ikke finde nogen pakke, hvis navn eller beskrivelse passer på \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -854,7 +838,7 @@ msgstr ""
 "Kunne ikke finde nogen pakke som passer på \"%s\", men følgende\n"
 "pakker har \"%s\" i deres beskrivelse:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Forkert tegn \"%c\" til handling\n"
@@ -878,102 +862,87 @@ msgstr "Fejl "
 msgid "Changelog download failed: %s"
 msgstr "Hentning af ændringslog mislykkedes: %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Kan ikke starte et skærmvisningsprogram, virker dette Debian-system?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "%s er ikke en officiel Debian-pakke, kan ikke vise dens ændringslog."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Kunne ikke finde en ændringslog til %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 #| msgid "Couldn't find a changelog for %s"
 msgid "Couldn't run pager %s"
 msgstr "Kunne ikke finde en ændringslog til %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E:  kommandoen \"clean\" tager ingen argumenter\n"
+msgid "The clean command takes no arguments"
+msgstr "Kommandoen \"clean\" tager ingen argumenter"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Slet %s* %sdelvis/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 #| msgid "Unable to look up your home directory, saving to /tmp/function_pkgs!"
 msgid "Unable to lock the download directory"
 msgstr "Kunne ikke finde dit hjemmekatalog, gemmer i /tmp/function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Slet %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E:  kommandoen \"autoclean\" tager ingen argumenter\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Kommandoen \"autoclean\" tager ingen argumenter"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Ville frigøre %sB diskplads\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Frigjorde %sB diskplads\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ugyldig operation %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Uventet argument til mønster efter \"keep-all\""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "Kunne ikke foretage sikker udredning af afhængigheder, prøv med\n"
-"--full-resolver.\n"
+"--full-resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Afbryd.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "download: du skal angive mindst én pakke til download\n"
+msgid "download: you must specify at least one package to download"
+msgstr "download: du skal angive mindst én pakke til download"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Kunne ikke læse liste over pakkekilder"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Kan ikke finde nogen pakke ved navn \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1015,33 +984,24 @@ msgid "[Working]"
 msgstr "[Arbejder]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 "extract-cache-entries: mindst et argument er påkrævet (kataloget som filer "
-"skal skrives til).\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Ingen sådan pakke \"%s\""
+"skal skrives til)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 "Ingen pakke blev valgt ud fra det angivne søgemønster. Intet at gøre.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: Kommandoen \"forget-new\" tager ingen argumenter\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Kommandoen \"forget-new\" tager ingen argumenter"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Ville glemme hvilke pakker der er nye\n"
@@ -1150,19 +1110,19 @@ msgstr "Følgende pakker vil blive opgraderet:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Følgende delvist installerede pakker vil blive konfigurerede:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Følgende ESSENTIELLE pakker vil blive AFINSTALLERET!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "Følgende ESSENTIELLE pakkers afhængigheder vil blive BRUDT af denne "
 "handling:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1171,16 +1131,16 @@ msgstr ""
 "ADVARSEL: Udførelsen af denne handling vil nok ødelægge dit system!\n"
 "          Fortsæt IKKE, medmindre du ved PRÆCIS hvad det er du gør!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Jeg er klar over at dette er en meget dårlig idé"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "For at fortsætte, indtast sætningen \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1197,7 +1157,7 @@ msgstr ""
 "Du bør kun fortsætte med installeringen hvis du er sikker i din sag.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1206,7 +1166,7 @@ msgstr ""
 "*** ADVARSEL ***  Ignorerer disse tillidskrænkelser fordi\n"
 "                  %s::CmdLine::Ignore-Trust-Violations er \"sand\"!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1219,7 +1179,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr "Ja"
 
@@ -1228,96 +1188,96 @@ msgstr "Ja"
 #. 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr "Nej"
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Vil du ignorere denne advarsel og fortsætte alligevel?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "For at fortsætte, indtast \"%s\"; for at afbryde indtast \"%s\": "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Forkert indtastning. Indtast enten \"%s\" eller \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Følgende pakker ANBEFALES installeret, men vil IKKE blive det:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Følgende pakker FORESLÅS installeret, men vil IKKE blive det:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Ingen pakker vil blive installeret, opgraderet eller afinstalleret.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pakker opgraderet, %lu nyinstalleret, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu geninstalleret, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderet, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu til afinstallering og %lu ikke opgraderet.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Skal hente %sB/%sB arkiver. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Skal hente %sB arkiver. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Efter udpakning vil %sB blive brugt.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Efter udpakning vil %sB blive frigjort.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Ingen pakker at vise - angiv pakkenavne på linjen efter \"i\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Tryk retur for at fortsætte."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Ingen pakker fundet - angiv pakkenavne på linjen efter \"c\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1326,41 +1286,41 @@ msgstr ""
 "Ingen pakker fundet - indtast nul eller flere udgangspunkter for søgningen, "
 "efterfulgt af pakken.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "fortsæt med installeringen"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "afbryd og afslut"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr "vis oplysninger om en eller flere pakker; pakkenavnet skal følge \"i\""
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1368,39 +1328,39 @@ msgstr ""
 "vis Debians ændringslog for en eller flere pakker; pakkenavnet skal følge "
 "efter \"c\""
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "slå oversigt over pakkeafhængigheder fra/til"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "slå oversigt over ændringer i pakkestørrelser fra/til"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "slå oversigt over versionsnumre fra/til"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1408,26 +1368,26 @@ msgstr ""
 "forsøg at finde en grund til at installere en enkelt pakke, eller forklar "
 "hvorfor installering af én pakke skal medføre installering af en anden pakke."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "kør den automatiske afhængighedsudreder for at rette brudte afhængigheder."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "start den visuelle brugerflade"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1439,49 +1399,49 @@ msgstr ""
 "et eller flere pakkenavne (eller mønstre). Handlingen vil så blive anvendt "
 "på alle de pakker du anfører. Følgende handlinger kan bruges:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "\"+\" for at installere pakker"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "\"+M\" for at installere pakker samtidig med at de markeres automatisk "
 "installeret"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "\"-\" for at afinstallere pakker"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "\"_\" for at udrense pakker"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "\"=\" for at tilbageholde pakker"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 "\":\" for at bevare pakker i deres nuværende tilstand, uden at tilbageholde "
 "dem"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "\"&M\" for at markere pakker som automatisk installerede"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "\"&m\" for at markere pakker som manuelt installerede"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "\"&BD\" for at installere en pakkes byggeafhængigheder."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1493,29 +1453,29 @@ msgstr ""
 "{u}\".  Disse tegn kan give yderligere information om pakkens tilstand, og "
 "kan omfatte enhver kombination af følgende:"
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 msgid "'a': the package was automatically installed or removed."
 msgstr "\"a\": pakken blev automatisk installeret eller fjernet."
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 "\"b\": nogle af pakkens afhængigheder strider mod den foreslåede ændring."
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr "\"p\": pakken vil blive udrenset ud over at blive fjernet."
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr "\"u\": pakken bliver fjernet fordi den ikke bruges."
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Kommandoer:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1523,19 +1483,19 @@ msgstr ""
 "aptitude kunne ikke udrede disse afhængigheder. Du kan selv udrede dem "
 "manuelt eller taste \"n\" for at afslutte."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Vil du fortsætte? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Udred disse afhængigheder manuelt? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Ugyldigt svar. Anfør en gyldig kommando eller \"?\" for hjælp.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1544,7 +1504,7 @@ msgstr ""
 "installere en pakke), \"R\" for at forsøge automatisk afhængighedsudredning "
 "eller \"N\" for at annullere."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1555,7 +1515,7 @@ msgstr ""
 "Oplysning om afhængigheder vil blive vist\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1566,7 +1526,7 @@ msgstr ""
 "Oplysning om afhængigheder vil ikke blive vist\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1577,7 +1537,7 @@ msgstr ""
 "Versioner vil blive vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1588,7 +1548,7 @@ msgstr ""
 "Versioner vil ikke blive vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1599,7 +1559,7 @@ msgstr ""
 "Størrelsesændringer vil blive vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1741,6 +1701,11 @@ msgstr "Forventede mindst én angivelse af pakke og version efter \"%c\""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Forventede et versionsnummer eller \"%s\" efter \"%s\""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Ingen sådan pakke \"%s\""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1899,7 +1864,7 @@ msgstr ""
 "Afhængigheder ønskes udredt, men der er ikke oprettet nogen "
 "afhængighedsudreder for disse."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1929,7 +1894,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "De følgende kommandoer er tilgængelige:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Fil som status for afhængighedsudreder skrives til: "
 
@@ -1962,7 +1927,7 @@ msgstr ""
 "*** FEJL: søgning afbrudt pga. en kritisk undtagelse. Du kan fortsætte\n"
 "          søgningen, men visse løsninger vil være utilgængelige."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1975,24 +1940,23 @@ msgstr ""
 "  Du kan måske løse dette problem ved at øge\n"
 "  Aptitude::ProblemResolver::StepLimit (i øjeblikket %d)."
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Kan ikke udrede afhængigheder for opgraderingen: Ingen løsning fundet."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Kan ikke udrede afhængigheder for opgraderingen: %s"
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "iconv på %s mislykkedes.\n"
+msgid "iconv of %s failed"
+msgstr "iconv på %s mislykkedes"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "søg: du skal indtaste mindst én søgeterm\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "søg: du skal indtaste mindst én søgeterm"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2035,7 +1999,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Følgende pakker har uopfyldte afhængigheder:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NUL>"
@@ -2258,7 +2222,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Giver"
 
@@ -2272,15 +2236,9 @@ msgstr "Beskrivelse: "
 msgid "Homepage: "
 msgstr "Hjemmeside: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Kunne ikke finde pakke %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Kunne ikke fortolke mønster %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Fandt ingen pakker"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2291,14 +2249,13 @@ msgstr "Ville hente/installere/afinstallere pakker.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Intern fejl, sortering ikke afsluttet"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Sletter hentede filer som er forældede"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E:  Kommandoen \"update\" tager ingen argumenter\n"
+msgid "The update command takes no arguments"
+msgstr "Kommandoen \"update\" tager ingen argumenter"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2315,125 +2272,147 @@ msgstr "Fjerner brugermærkat \"%s\" fra pakken \"%s\".\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr "%s: for få argumenter. Forventede mindst et mærkatnavn og en pakke.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Ingen kandidat-version fundet for %s\n"
+msgid "No candidate version found for %s"
+msgstr "Ingen kandidat-version fundet for %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Ingen aktuel eller kandidat-version fundet for %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "Ingen aktuel eller kandidat-version fundet for %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Kunne ikke finde et arkiv \"%s\" til pakken \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Kunne ikke finde et arkiv \"%s\" til pakken \"%s\""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Kunne ikke finde en version \"%s\" til pakken \"%s\"\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Kunne ikke finde en version \"%s\" til pakken \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Intern fejl: ugyldig værdi %i givet til cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Intern fejl: ugyldig værdi %i givet til cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Man kan ikke anføre både et arkiv og en version af en pakke\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Man kan ikke anføre både et arkiv og en version af en pakke"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't find a changelog for %s"
-msgid "Couldn't find task '%s'"
-msgstr "Kunne ikke finde en ændringslog til %s"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d brudt [%+d]"
 msgstr[1] "%d brudte [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d opdatering [%+d]"
 msgstr[1] "%d opdateringer [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d ny [%+d]"
 msgstr[1] "%d nye [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Aktuel status: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "Der er %d nyligt forældet pakke."
 msgstr[1] "Der er %d nyligt forældede pakker."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "Der er %d nyligt forældet pakke: "
 msgstr[1] "Der er %d nyligt forældede pakker: "
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Intet komma efter mærkatnavn \"%s\""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Kunne ikke finde pakke %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find task '%s'"
+msgstr "Kunne ikke finde en ændringslog til %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Bemærk: vælger opgavepakken \"%s: %s\" til installering\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Kunne ikke finde en ændringslog til %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, c-format
 msgid "Package %s:"
 msgstr "Pakke %s:"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, c-format
 msgid "Source package %s:"
 msgstr "Kildepakke %s:"
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, c-format
 msgid "Archive %s:"
 msgstr "Arkiv %s:"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr "arkiv"
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr "auto"
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr "ingen"
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr "pakke"
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr "kildepakke"
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr "kildeversion"
 
 # Koden tillader både danske og engelske
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
@@ -2443,10 +2422,9 @@ msgstr ""
 "\"pakke\", \"kildepakke\" eller \"kildeversion\", eller på engelsk \"none\", "
 "\"package\", \"source-package\" eller \"source-version\")"
 
-#: src/cmdline/cmdline_versions.cc:584
-#, c-format
-msgid "versions: You must provide at least one package selector\n"
-msgstr "versions: Du skal give mindst én pakkevælger\n"
+#: src/cmdline/cmdline_versions.cc:578
+msgid "versions: You must provide at least one package selector"
+msgstr "versions: Du skal give mindst én pakkevælger"
 
 #: src/cmdline/cmdline_why.cc:290
 msgid "dep_level"
@@ -2468,7 +2446,7 @@ msgstr "Aktuel"
 msgid "Candidate"
 msgstr "Kandidat"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Installér"
 
@@ -2571,22 +2549,19 @@ msgstr "Kunne ikke finde en grund til at installere %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Pakker der kræver %s:"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Der findes ingen pakke ved navn \"%s\"."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Kunne ikke fortolke visse sammenligningsmønstre."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
-msgstr ""
-"%s: denne kommando kræver mindst ét argument (pakken der spørges til).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
+msgstr "%s: denne kommando kræver mindst ét argument (pakken der spørges til)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2612,11 +2587,11 @@ msgstr "UOPFYLDT"
 msgid "UNAVAILABLE"
 msgstr "UTILGÆNGELIG"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Mærkater"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Brugers mærkater"
 
@@ -2820,33 +2795,33 @@ msgstr ""
 "skrivebeskyttet tilstand. Enhver ændring du laver i pakkernes status vil "
 "IKKE blive bevaret!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 #| msgid "allow_choices"
 msgid "allowed"
 msgstr "allow_choices"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "main"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2922,35 +2897,43 @@ msgstr ""
 "Ugyldigt sikkerhedsniveau \"%s\" (ikke \"discard\", \"maximum\", \"minimum\" "
 "eller et heltal)."
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "Pakkecachen er ikke tilgængelig; kunne ikke hente og installere pakker."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Intern fejl: kunne ikke lave en liste over pakker til download"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Kunne ikke hente %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Kunne ikke hente nogle af arkiverne. Prøv evt. at køre 'aptitude update' "
+"eller prøv med --fix-missing."
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Kan ikke korrigere for utilgængelige pakker"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "En pakke lod sig ikke installere. Prøver at overvinde problemet:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3099,13 +3082,13 @@ msgstr ""
 "\n"
 "Log færdig.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr "Tilgår indeks"
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 msgid "Filtering packages"
 msgstr "Filtrerer pakker"
 
@@ -3216,18 +3199,18 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Pakkeindeksfilerne er ødelagt. Ingen Filename:-linje for pakke %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Ændringslog for %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "Kunne ikke hente ændringslogge: %s"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Kunne ikke hente ændringslogge: uventet undtagelse."
 
@@ -3276,25 +3259,26 @@ msgstr "Kunne ikke danne uddatafil: barneproces dræbt ved status %d."
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Kunne ikke fortolke omkostningsstreng: %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Opbygger database over mærkater"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr "ældre"
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 msgid "No tag descriptions are available."
 msgstr "Der er ingen tilgængelige mærkebeskrivelser."
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, c-format
 msgid "No description available for %s."
 msgstr "Der er ingen tilgængelige beskrivelser til %s."
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr "ældre"
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3438,41 +3422,41 @@ msgstr "Aptitude pakkestyring"
 msgid "_File"
 msgstr "_Fil"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Udfør alle afventende installeringer og afinstalleringer"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Se efter nye versioner af pakker"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Markér alle ikke-tilbageholdte pakker til opgradering"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Glem hvilke pakker der er \"nye\""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Annullér alle afventende installeringer, afinstalleringer, tilbageholdelser "
 "og opgraderinger."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Slet tidligere hentede pakkefiler"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Slet pakkefiler som ikke længere kan hentes"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Genindlæs pakkecachen"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3482,7 +3466,7 @@ msgstr ""
 "Kør \"su\" for at blive root. Dette vil genstarte programmet, men dine "
 "indstillinger vil blive bevaret"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Afslut programmet"
 
@@ -3490,7 +3474,7 @@ msgstr "Afslut programmet"
 msgid "E_dit"
 msgstr "Re_digér"
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Fortryd den sidste pakkehandling eller gruppe af handlinger"
 
@@ -3522,7 +3506,7 @@ msgid "_Help"
 msgstr "_Hjælp"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr "Instrumentbræt"
 
@@ -3530,19 +3514,19 @@ msgstr "Instrumentbræt"
 msgid "Update"
 msgstr "Opdatér"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Pakker"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Afhængighedsudreder"
 
@@ -3717,7 +3701,7 @@ msgid "Fix Manually"
 msgstr "Reparér manuelt"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Opgradér"
 
@@ -4245,11 +4229,11 @@ msgstr "Installeret"
 msgid "Reinstall"
 msgstr "Geninstallér"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Nedgradèr"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Afinstallér"
 
@@ -4281,7 +4265,7 @@ msgstr "Du skal være root (administrator) for at opdatere pakkelisterne."
 msgid "Download already running."
 msgstr "Download er allerede i gang."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "En opdatering af pakkelister/installeringskørsel foregår allerede."
 
@@ -4349,41 +4333,41 @@ msgstr "Fejl i pakken %s"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Spørger om opsætningsfilen %s skal erstates"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Henter pakker"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr "Brudte pakker"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr "Vis brudte pakker"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr "Udred afhængigheder"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "%d brudt pakke."
 msgstr[1] "%d brudte pakker."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr "Vis ændringer"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr "Udfør ændringer"
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4393,60 +4377,60 @@ msgstr[1] "%d pakker til installering"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%d pakke til afinstallering"
 msgstr[1] "%d pakker til afinstallering"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr "Download-størrelse: %sB."
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr "Mærkater til %s:\n"
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr "Denne egenskab er endnu ikke implementeret."
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr "Ikke implementeret"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr "Installér/opgradér"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr "Udrens"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Behold"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Tilbagehold"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr "Markér som automatisk"
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr "Markér som manuel"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr "Skift status for automatisk"
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4482,7 +4466,7 @@ msgstr "Info"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4526,15 +4510,15 @@ msgstr "%s bliver installeret manuelt."
 msgid "Cache reloading, please wait..."
 msgstr "Cache genindlæses, vent venligst ..."
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr "Søger ..."
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr "Færdiggører oversigt"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Danner oversigt"
@@ -5260,111 +5244,112 @@ msgstr "Ukendt grupperingstype \"%s\""
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 #| msgid "By-name sorting policies take no arguments"
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Sorteringsmetode efter navn tager ingen parametre"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Ugyldigt nullængde-navn på sorteringsmetode"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Ubalanceret \"(\" i beskrivelse af sorteringsmetode"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Ugyldig type \"%s\" på sorteringsmetode"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Kan ikke afkode multibyte-streng efter \"%ls\""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Kan ikke afkode tekststreng med unicode-tegn efter \"%s\""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s oversat på %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Oversætter: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Compiled mod:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt version %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  NCurses version: Ukendt\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  NCurses version %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++ version: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Ept-understøttelse slået til.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Ept-understøttelse slået fra.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  Gtk+ version %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  Gtk-- version %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Gtk+-understøttelse slået fra.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 #| msgid "%s %s compiled at %s %s\n"
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s oversat på %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Qt support disabled.\n"
 msgstr "  Ept-understøttelse slået fra.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5372,32 +5357,32 @@ msgstr ""
 "\n"
 "Aktuelle versioner af programbiblioteker:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  NCurses version %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  cwidget version: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Apt version: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Brug: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [tilvalg] <handling> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5406,42 +5391,42 @@ msgstr ""
 "  Handlinger (er ingen angivet, startes den skærmbaserede brugerflade):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Installér/opgradér pakker.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Afinstallér pakker.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Afinstallér pakker og deres opsætningsfiler.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Tilbagehold pakker.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Fortryd tilbageholdelse af en pakke.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Markér pakker som værende automatisk installeret.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Markér pakker som værende manuelt installeret.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5450,17 +5435,17 @@ msgstr ""
 " forbid-version - Forbyd aptitude at opgradere til en specifik "
 "pakkeversion.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Hent lister over nye/opgradérbare pakker.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade  - Udfør en sikker opgradering.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5469,53 +5454,53 @@ msgstr ""
 " full-upgrade - Udfør en opgradering - pakker vil muligvis blive installeret "
 "og afinstalleret.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr " build-dep    - Installér pakkers byggeafhængigheder.\n"
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Glem hvilke pakker der er \"nye\".\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Søg efter en pakke ud fra navn og/eller udtryk.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Vis detaljerede oplysninger om en pakke.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package.\n"
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Vis detaljerede oplysninger om en pakke.\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Slet hentede pakkefiler.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Slet gamle, hentede pakkefiler.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Vis en pakkes ændringslog.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Hent en pakkes .deb-fil.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5524,7 +5509,7 @@ msgstr ""
 " reinstall    - Hent og (om muligt) geninstallér en aktuelt installeret "
 "pakke.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5535,7 +5520,7 @@ msgstr ""
 "                eller hvorfor en eller flere pakker kræver den angivne "
 "pakke.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5549,17 +5534,17 @@ msgstr ""
 "                føre til en konflikt med den angivne pakke hvis "
 "installeret.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Tilvalg:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Denne hjælpetekst.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
@@ -5567,20 +5552,20 @@ msgstr ""
 " --gui          Anvend den grafiske brugerflade GTK, selvom den er slået fra "
 "i opsætningen.\n"
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 " --no-gui       Anvend ikke den grafiske brugerflade, GTK, selvom den er "
 "tilgængelig,\n"
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 #| msgid " -h             This help text.\n"
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Denne hjælpetekst.\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, fuzzy, c-format
 #| msgid ""
 #| " --gui          Use the GTK GUI even if disabled in the configuration.\n"
@@ -5590,31 +5575,31 @@ msgstr ""
 " --gui          Anvend den grafiske brugerflade GTK, selvom den er slået fra "
 "i opsætningen.\n"
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simulér handlinger uden faktisk at udføre dem.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Hent kun pakker, installér eller afinstallér ikke noget.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Spørg altid om bekræftelse eller handlinger.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
 " -y             Antag at svaret til simple ja/nej-spørgsmål er \"ja\".\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5623,7 +5608,7 @@ msgstr ""
 " -F format      Anfør et format til oversigt over søgeresultater; se "
 "manualen.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5631,50 +5616,50 @@ msgid ""
 msgstr ""
 " -O order       Anfør sorteringsorden for søgeresultater; se manualen.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr ""
 " -w width       Angiv en skærmbredde til formatering af søgeresultater.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Prøv aggressivt at reparere brudte pakkeafhængigheder.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Vis hvilke versioner af pakker der skal installeres.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             Vis afhængigheder for pakker der er ændret automatisk.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z             Vis ændring i hver installeret pakkes pladsforbrug.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
 msgstr " -v             Vis ekstra oplysninger (kan anføres flere gange).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [udgave]  Angiv hvilken udgave pakker skal installeres fra.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5683,13 +5668,13 @@ msgstr ""
 " -q             I kommandolinjetilstand, undertryk de fortløbende\n"
 "                fremgangsinformation.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o nøgle=værdi Tildel værdi direkte til opsætningstilvalget \"nøgle\".\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5698,76 +5683,76 @@ msgstr ""
 " --with(out)-recommends\tAngiv om anbefalede pakker skal behandles som\n"
 "                stærke afhængigheder.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S fname       læs aptitudes udvidede statusinfo fra fnavn.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Hent nye pakkelister ved opstart\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr "                  (kun terminal-brugerflade)\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Udfør en installeringskørsel ved opstart\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Denne aptitude har ikke \"Super Cow Powers\".\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 msgid "trace"
 msgstr "sporing"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 msgid "debug"
 msgstr "fejlsøg"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:399
+#: src/main.cc:365
 msgid "info"
 msgstr "info"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 msgid "warn"
 msgstr "advar"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:405
+#: src/main.cc:371
 msgid "error"
 msgstr "fejl"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 msgid "fatal"
 msgstr "kritisk"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr "slået fra"
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
@@ -5777,49 +5762,29 @@ msgstr ""
 "\"fejlsøg\", \"info\", \"advar\", \"fejl\", \"kritisk\", eller \"slået fra"
 "\")."
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, c-format
-msgid "Invalid logger name \"%s\"."
-msgstr "Ugyldigt logningsbetegnelse \"%s\"."
+msgid "Invalid logger name \"%s\""
+msgstr "Ugyldigt logningsbetegnelse \"%s\""
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Forventede et tal efter -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Forventede et tal efter -q=, fik %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o kræver et argument på formen taste=værdi, fik %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Intet komma efter mærkatnavn \"%s\".\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "MYSTISK: modtog en ukendt kode for tilvalg\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr "aldrig"
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr "auto"
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr "altid"
 
 # Begge dele tillades jf. kildekoden
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
@@ -5828,29 +5793,29 @@ msgstr ""
 "Ugyldig tilstand \"%s\" til visning af pakkenavne (skal være \"aldrig\", "
 "\"auto\" eller \"altid\", eller engelsk \"never\"/\"always\")."
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr "ingen-opsummering"
 
-#: src/main.cc:1027
+#: src/main.cc:781
 msgid "first-package"
 msgstr "første-pakke"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr "første-pakke-og-type"
 
-#: src/main.cc:1031
+#: src/main.cc:785
 msgid "all-packages"
 msgstr "alle-pakker"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr "alle-pakke-med-afh-versioner"
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5861,38 +5826,42 @@ msgstr ""
 "\", \"første-pakke\", \"første-pakke-og-type\", \"alle-pakker\", eller "
 "\"alle-pakker-med-afh-versioner\"."
 
-#: src/main.cc:1079
+#: src/main.cc:831
+#, fuzzy
+#| msgid ""
+#| "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may "
+#| "be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr ""
 "Kun en af --auto-clean-on-startup, --clean-on-startup, -i, and -u kan "
 "angives\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
+#, fuzzy
+#| msgid ""
+#| "-u, -i, and --clean-on-startup may not be specified in command-line mode "
+#| "(eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u, -i, og --clean-on-startup må ikke angive i kommandolinjetilstand (f."
 "eks., med \"install\")"
 
-#: src/main.cc:1105
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u, -i, og --clean-on-startup må ikke angives i en kommando"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Ukendt kommando \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Ukendt kommando \"%s\""
 
 # Uncaught? -MBJ
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Uncaught exception: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5910,7 +5879,7 @@ msgstr "Søg efter: "
 msgid "Search backwards for: "
 msgstr "Søg baglæns efter: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Minestryger"
 
@@ -6127,7 +6096,7 @@ msgstr "Kodning af mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Pakke"
 
@@ -6208,8 +6177,8 @@ msgstr "<N/A>"
 msgid "<none>"
 msgstr "<ingen>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtuel"
@@ -6343,7 +6312,7 @@ msgstr "Kan ikke omkode format på pakkeoversigt efter \"%ls\""
 msgid "Internal error: Default column string is unparsable"
 msgstr "Intern fejl: Standard kolonnestreng kan ikke fortolkes"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Opgavepakker"
 
@@ -6499,11 +6468,11 @@ msgstr "Match-indeks skal være 1 eller højere, ikke \"%s\""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "Match-indeks %ls er for stort; tilgængelige grupper er (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PAKKER UDEN MÆRKATER"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6514,10 +6483,6 @@ msgstr ""
 "databasen er ikke tilgængelig (installering af debtags kan måske rette dette "
 "problem)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "MANGLENDE MÆRKAT"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Kildepakke: "
@@ -7149,7 +7114,7 @@ msgstr "Indlæser cache"
 msgid "Really quit Aptitude?"
 msgstr "Afslut Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Ændr den måde aptitude opfører sig på"
 
@@ -7229,7 +7194,7 @@ msgstr ""
 msgid "License"
 msgstr "Licens"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Læs betingelserne for kopiering og distribuering af aptitude"
 
@@ -7250,7 +7215,7 @@ msgstr "Online-hjælp"
 msgid "View a brief introduction to aptitude"
 msgstr "Se en kort introduktion til aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Hjælp"
 
@@ -7279,7 +7244,7 @@ msgstr "Manuel"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Vis en liste over ofte stillede spørgsmål"
 
@@ -7320,15 +7285,15 @@ msgstr ""
 "%nVil du fjerne dette katalog og alle filer heri? Hvis du vælger \"Nej\", "
 "vil du ikke se denne meddelelse igen."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Vis udvikling ved download af pakker"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Download af pakker"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7340,35 +7305,35 @@ msgstr ""
 "system%b. Du bør kun fortsætte med installeringen hvis du er sikker i din "
 "sag.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [version %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Fortsæt"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Afbryd installeringen"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Forhåndsvisning af pakkeinstallering"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Vis og/eller korrigér de handlinger der skal udføres"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Visse pakkeafhængigheder var brudte og er blevet repareret:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Der findes ingen løsning på problemerne med disse pakkeafhængigheder!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7377,7 +7342,7 @@ msgstr ""
 "Tid udløbet ved forsøg på at udrede afhængigheder (tast \"%s\" for at prøve "
 "mere ihærdigt)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7385,19 +7350,19 @@ msgstr ""
 "Installering/afinstallering af pakker kræver administrative rettigheder som "
 "du ikke har lige nu. Vil du ændre bruger til root?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Bliv root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Bliv ikke root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ingen pakker vil blive installeret, opgraderet eller afinstalleret."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7407,19 +7372,19 @@ msgstr ""
 "pakker kunne opgraderes, men du har valgt ikke at opgradere dem. Tast \"U\" "
 "for at igangsætte en opgradering."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Opdaterer pakkelister"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Vis udvikling ved opdatering af pakkelisten"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Opdatering af pakkeliste"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7427,23 +7392,23 @@ msgstr ""
 "Opdatering af pakkelisterne kræver administrative rettigheder som du ikke "
 "har lige nu. Vil du ændre bruger til root?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Spild tid mens du prøver at finde miner"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Tømning er ikke tilladt mens der hentes filer"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Sletter hentede filer"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Hentede pakkefiler er blevet slettet"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7451,11 +7416,11 @@ msgstr ""
 "Tømning af pakkecachen kræver administrative rettigheder som du ikke har "
 "lige nu. Vil du ændre bruger til root?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "Apts cachefil er ikke tilgængelig; kan ikke køre auto-clean."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7463,7 +7428,7 @@ msgid ""
 msgstr ""
 "Hentede, forældede pakkefiler er blevet slettet. %sB diskplads er frigjort."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7471,122 +7436,122 @@ msgstr ""
 "Sletning af forældede filer kræver administrative rettigheder som du ikke "
 "har lige nu. Vil du ændre bruger til root?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Ikke flere løsninger."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Kunne ikke finde en anvendelig løsning."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Tid udløbet under forsøg på at finde en løsning."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Udred afhængigheder"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Søg efter løsninger på uopfyldte afhængigheder"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Kunne ikke åbne %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Fejl ved dumpning af status for afhængighedsudreder"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Installér/afinstallér pakker"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "Opdatér pakkeliste"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Markér op^gradérbare"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Ryd liste over nye pakker"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "A^nnullér afventende handlinger"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Tøm pakkecache"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Slet f^orældede filer"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Genindlæs pakkecache"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Spil minestryger"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Bliv ^root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Afslut"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Fortryd"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Installér"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Markér den aktuelt valgte pakke til installering eller opgradering"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Afinstallér"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Markér den aktuelt valgte pakke til afinstallering"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Udrens"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Markér den aktuelt valgte pakke og dens opsætningsfiler til afinstallering"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Behold"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Fortryd alle handlinger på den valgte pakke"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Tilbagehold"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7594,11 +7559,11 @@ msgstr ""
 "Fortryd alle handlinger på den valgte pakke og beskyt den mod fremtidige "
 "opgraderinger"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Markér aut^o"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7606,11 +7571,11 @@ msgstr ""
 "Markér den valgte pakke som værende automatisk installeret; den vil blive "
 "afinstalleret automatisk hvis ingen andre pakker afhænger af den"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Markér ^manuel"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7618,11 +7583,11 @@ msgstr ""
 "Markér den valgte pakke som værende manuelt installeret; den vil ikke blive "
 "afinstalleret medmindre du gør det manuelt"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Forbyd version"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7630,19 +7595,19 @@ msgstr ""
 "Forbyd at kandidat-versionen af den valgte pakke bliver installeret; nyere "
 "versioner af pakken vil blive installeret som sædvanlig"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "Opl^ysninger"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Vis flere oplysninger om den valgte pakke"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "Ge^nnemløb pakkeoplysninger"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7652,60 +7617,60 @@ msgstr ""
 "pakkens lange beskrivelse, et sammendrag af status for dens afhængigheder, "
 "eller en analyse af hvorfor pakken er påkrævet."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "Ændrings^log"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Vis Debians logfil over programændringer for den valgte pakke"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Gennemgå løsning"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 "Gennemgå den aktuelt valgte løsning på problemerne med pakkeafhængigheder."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "^Anvend løsning"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Udfør handlingerne i den aktuelt valgte løsning."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Næste løsning"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Vælg den næste løsning på problemerne med pakkeafhængigheder."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^Forrige løsning"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Vælg den forrige løsning på problemerne med pakkeafhængigheder."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "Førs^te løsning"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Vælg den første løsning på problemerne med pakkeafhængigheder."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "^Sidste løsning"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7713,35 +7678,35 @@ msgstr ""
 "Vælg den indtil nu sidst beregnede løsning på problemerne med "
 "pakkeafhængigheder."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Skift af^vist"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Skift mellem om den aktuelt valgte handling er afvist eller ej."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Skift g^odkendt"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Skift mellem om den aktuelt valgte handling er godkendt eller ej."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "Vis ^målpakke"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Vis pakke som vil blive påvirket af den valgte handling"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Afvis at bryde tilbage^holdelser"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7749,221 +7714,221 @@ msgstr ""
 "Afvis alle handlinger som medfører en ændring i status for tilbageholdte "
 "pakker eller som installerer forbudte versioner"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Find"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Søg fremad"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "Find ^baglæns"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Søg baglæns"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Find ^igen"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Gentag sidste søgning"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Find igen ^baglæns"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Gentag sidste søgning i den modsatte retning"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Afgræns oversigt"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Anvend et filter på pakkelisten"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "F^jern afgrænsning"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Fjern filteret fra pakkelisten"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Find br^udte"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Find næste pakke med uopfyldte afhængigheder"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Præferencer"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^Brugergrænseflade"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Skift indstillinger som påvirker brugergrænsefladen"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Afhængigheder"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Skift indstillinger som påvirker håndteringen af pakkeafhængigheder"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Diverse"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Skift diverse programindstillinger"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Nulstil indstillinger"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Nulstil alle indstillinger til systemets forvalgte"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Næste"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Vis næste oversigt"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Forrige"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Vis forrige oversigt"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Luk"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Luk denne oversigt"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Ny pakke^oversigt"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Lav en ny standard for pakkeoversigt"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Se ^anbefalinger"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr "Vis pakker som anbefales installeret, men som du ikke har installeret."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Ny ^total pakkeoversigt"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Vis alle pakker på systemet i en enkelt, ukategoriseret oversigt"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Ny ^debtags-oversigt"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Brug debtags-mærkater ved visning af pakker"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Ny ^kategori-oversigt"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Vis pakker efter kategori"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Om"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Vis oplysninger om dette program"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Hjælp"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Læs online-hjælpen"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Brugervejledning"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Vis den udførlige brugervejledning"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Nye"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Vis vigtige ændringer lavet i hver version af "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licens"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Handlinger"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Søg"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Indstillinger"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Oversigter"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7972,11 +7937,11 @@ msgstr ""
 "%ls: Menu  %ls: Hjælp  %ls: Afslut  %ls: Opdatér  %ls: Hent/(af)installér "
 "pakker"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "ja_taste"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "nej_taste"
 
@@ -8004,9 +7969,48 @@ msgstr "Kunne ikke hente ændringsloggen til %s: %s"
 msgid "Downloading the changelog of %s"
 msgstr "Henter ændringsloggen for %s"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Du kan kun se ændringslogfiler for officielle Debian-pakker."
+#~ msgid "MISSING TAG"
+#~ msgstr "MANGLENDE MÆRKAT"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL som ændringslogs skal hentes fra"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Her angives hvilken adresse ændringslogfiler skal hentes fra på Debians "
+#~ "website. Du behøver kun at ændre denne hvis ændringslogfilerne flytter "
+#~ "til en anden adresse."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s er ikke en officiel Debian-pakke, kan ikke vise dens ændringslog."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Kan ikke finde nogen pakke ved navn \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Kunne ikke fortolke mønster %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Forventede et tal efter -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Forventede et tal efter -q=, fik %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o kræver et argument på formen taste=værdi, fik %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "MYSTISK: modtog en ukendt kode for tilvalg\n"
+
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u, -i, og --clean-on-startup må ikke angives i en kommando"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Du kan kun se ændringslogfiler for officielle Debian-pakker."
 
 #~ msgid "Err "
 #~ msgstr "Fejl "
diff --git a/po/de.gmo b/po/de.gmo
index 4232c67e..800e6816 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 446f12ce..e945f798 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude 0.6.6-1\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:22+0800\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -368,24 +368,10 @@ msgstr ""
 "einem in sources.list aufgeführten Archiv heruntergeladen werden können."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL für Änderungsprotokolle (Changelog)"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Diese Option steuert die Vorlage, die zum Herunterladen von "
-"Änderungsprotokollen von der Debian-Website verwendet wird. Sie müssen dies "
-"nur ändern, falls sich die URL der Änderungsprotokolle ändert."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Vor der Durchführung eine Vorschau der geplanten Änderungen anzeigen"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -393,12 +379,12 @@ msgstr ""
 "Falls diese Option aktiviert ist, wird Aptitude vor einer Installation "
 "zuerst eine Zusammenfassung der durchzuführenden Aktionen anzeigen."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Beim Aktualisieren der Paketlisten immer »neue Pakete vergessen«"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -407,12 +393,12 @@ msgstr ""
 "löschen, nachdem Sie die Paketlisten aktualisieren (z.B. durch Drücken von "
 "»u«)."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Bei jeder (De-)Installation immer »neue Pakete vergessen«"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -422,12 +408,12 @@ msgstr ""
 "löschen, nachdem Sie eine Installation starten (oder von der Befehlszeile "
 "eine Installation oder Entfernung veranlassen)."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "Keine Warnung bei der ersten Änderung im schreibgeschützten Modus"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -437,13 +423,13 @@ msgstr ""
 "anzeigen, wenn Sie den Status eines Paketes modifizieren, obwohl Sie nicht "
 "die Rechte haben, Änderungen am System vorzunehmen."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Warnen, wenn eine privilegierte Aktion als nicht-root durchgeführt werden "
 "soll"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -456,11 +442,11 @@ msgstr ""
 "die Möglichkeit geboten, sich als root anzumelden und die Aktion mit root-"
 "Rechten ausführen."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Protokoll in folgender Datei führen:"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -472,11 +458,11 @@ msgstr ""
 "Datei ein Pipe-Zeichen (»%B|%b«) ist, wird der Rest des Namens als Shell-"
 "Kommando interpretiert, das das Protokoll über die Standardeingabe empfängt."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Automatisch Abhängigkeiten auflösen, wenn ein Paket ausgewählt wird"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -489,12 +475,12 @@ msgstr ""
 "interne Abhängigkeitsauflöser, kann aber nicht optimale Ergebnisse liefern "
 "oder in bestimmten Szenarien komplett fehlschlagen."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Autom. beschädigte Pakete reparieren vor dem Installieren oder Entfernen"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -507,11 +493,11 @@ msgstr ""
 "wird Aptitude Sie nach einer Lösung für die beschädigten Abhängigkeiten "
 "fragen."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Empfohlene Pakete automatisch installieren"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -529,11 +515,11 @@ msgstr ""
 "aktiviert sind, werden Pakete, die von einem installierten Paket empfohlen "
 "werden, nicht automatisch entfernt."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Nicht verwendete Pakete automatisch entfernen"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -551,11 +537,11 @@ msgstr ""
 "aktiviert sind, werden automatisch installierte Pakete nicht entfernt, falls "
 "ein installiertes Paket es empfiehlt."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Pakete, die niemals automatisch entfernt werden sollten"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -565,12 +551,12 @@ msgstr ""
 "ein installiertes Paket von ihnen abhängen würde: sie werden als unbenutztes "
 "Paket niemals zur Entfernung vorgesehen."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Abhängigkeitsauflösungen erlauben, die Zurückhaltungen od. Verbote ign."
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -592,15 +578,15 @@ msgstr ""
 "durch Installation oder Aktualisierung eines Pakets automatisch davon "
 "abhängige Pakete installiert werden. Dies ist Fehler #470035."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Optionen der Oberfläche"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Abhängigkeitsbehandlung"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
@@ -705,7 +691,7 @@ msgstr "Quellpaket zu »%s« kann nicht gefunden werden.\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Bauabhängigkeiten können nicht erfüllt werden: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -714,7 +700,7 @@ msgstr ""
 "Hinweis: »%s« stellt das virtuelle Paket\n"
 "      »%s« bereit und ist bereits installiert.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -723,7 +709,7 @@ msgstr ""
 "Hinweis: »%s« stellt das virtuelle Paket\n"
 "      »%s« bereit und wird ohnehin installiert.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -732,17 +718,22 @@ msgstr ""
 "»%s« existiert in der Paketdatenbank, ist aber kein\n"
 "echtes Paket und kein anderes Paket stellt es bereit.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "»%s« ist ein virtuelles Paket, das bereitgestellt wird von:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Sie müssen eines zum Installieren auswählen.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Für Paket »%s« existiert kein Installationskandidat."
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -751,18 +742,18 @@ msgstr ""
 "Hinweis: »%s« wird anstelle des\n"
 "         virtuellen Pakets »%s« gewählt.\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "»%s« ist bereits in der angeforderten Version (%s) installiert.\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 "%s ist momentan nicht installiert und wird folglich nicht aktualisiert.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
@@ -770,52 +761,45 @@ msgstr ""
 "»%s« ist bereits in der neuesten Version installiert, daher wird es nicht "
 "aktualisiert.\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 "%s ist momentan nicht installiert und wird folglich nicht erneut "
 "installiert.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Paket %s ist nicht installiert, wird nicht entfernt.\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "Paket %s ist nicht installiert, Aktualisierung kann nicht verboten werden.\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Paket %s kann nicht aktualisiert werden, Aktualisierung kann also nicht "
 "verboten werden.\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Hinweis: Task »%s: %s« wird zur Installation ausgewählt.\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Sie können die Version eines Pakets nur bei einem »install«- oder »forbid-"
-"version«-Befehl angeben.\n"
+"version«-Befehl angeben."
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
 msgstr ""
-"Sie können das Archiv eines Pakets nur bei einem »install«-Befehl angeben.\n"
+"Sie können das Archiv eines Pakets nur bei einem »install«-Befehl angeben."
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -824,7 +808,7 @@ msgstr ""
 "Paket »%s« konnte nicht gefunden werden und mehr als 40\n"
 "Pakete enthalten »%s« in ihrem Namen.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -833,14 +817,14 @@ msgstr ""
 "Paket »%s« konnte nicht gefunden werden, aber die folgenden\n"
 "Pakete enthalten »%s« in ihrem Namen:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Es konnte kein Paket gefunden werden, dessen Name oder Beschreibung auf »%s« "
 "passt.\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -859,7 +843,7 @@ msgstr ""
 "enthalten\n"
 "die folgenden Pakete »%s« in ihrer Beschreibung:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Ungültiges Befehlszeichen »%c«\n"
@@ -881,7 +865,7 @@ msgstr "Feh"
 msgid "Changelog download failed: %s"
 msgstr "Download des Änderungsprotokolls fehlgeschlagen: %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "»sensible-pager« kann nicht ausgeführt werden, ist dies ein funktionierendes "
@@ -889,96 +873,79 @@ msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"»%s« ist kein offizielles Debian-Paket, Änderungsprotokoll kann nicht "
-"angezeigt werden."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Änderungsprotokoll für »%s« konnte nicht gefunden werden."
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, c-format
 msgid "Couldn't run pager %s"
 msgstr "Pager »%s« konnte nicht gestartet werden."
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "F: Der »clean«-Befehl akzeptiert keine Argumente.\n"
+msgid "The clean command takes no arguments"
+msgstr "Der »clean«-Befehl akzeptiert keine Argumente."
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Löschen von %s* und %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 msgid "Unable to lock the download directory"
 msgstr "Sperre für das Download-Verzeichnis kann nicht gesetzt werden."
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Löschen von %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "F: Der »autoclean«-Befehl akzeptiert keine Argumente.\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Der »autoclean«-Befehl akzeptiert keine Argumente."
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "%sB würden freigegeben\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "%sB freigegeben\n"
 
 #  Should never happen.
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ungültige Operation: %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Unerwartetes Musterargument, das auf »keep-all« folgt"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "Abhängigkeiten können nicht sicher aufgelöst werden, versuchen Sie es mit "
-"der Option --full-resolver.\n"
+"der Option --full-resolver."
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Abbruch.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "download: Sie müssen mindestens ein Paket zum Herunterladen angeben.\n"
+msgid "download: you must specify at least one package to download"
+msgstr "download: Sie müssen mindestens ein Paket zum Herunterladen angeben."
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Liste der Quellen konnte nicht gelesen werden."
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Paket namens »%s« konnte nicht gefunden werden."
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1016,23 +983,14 @@ msgid "[Working]"
 msgstr "[Arbeite]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 "extract-cache-entries: mindestens ein Argument wird benötigt (das "
-"Verzeichnis,\n"
-"in das Dateien geschrieben werden sollen).\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Kein solches Paket »%s«"
+"Verzeichnis, in das Dateien geschrieben werden sollen)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
@@ -1040,11 +998,10 @@ msgstr ""
 "zu tun.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "F: Der »forget-new«-Befehl akzeptiert keine Argumente.\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Der »forget-new«-Befehl akzeptiert keine Argumente."
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Würde vergessen, welche Pakete neu sind\n"
@@ -1155,19 +1112,19 @@ msgstr "Die folgenden Pakete werden aktualisiert:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Die folgenden teilweise installierten Pakete werden konfiguriert:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Die folgenden ESSENTIELLEN Pakete werden ENTFERNT!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "Die folgenden ESSENTIELLEN Pakete werden nach dieser Änderung BESCHÄDIGT "
 "sein:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1177,17 +1134,17 @@ msgstr ""
 "beschädigen!\n"
 "         BRECHEN SIE AB, wenn Sie nicht GENAU wissen, was Sie tun!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Mir ist klar, dass das eine sehr schlechte Idee ist."
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Geben Sie zum Bestätigen den Satz »%s« ein:\n"
 
 # FIXME: nearly the same string as in src/ui.cc:1104
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1207,7 +1164,7 @@ msgstr ""
 "Sie dies wirklich wollen.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1216,7 +1173,7 @@ msgstr ""
 "*** WARNUNG ***   Ignorieren dieser Vertrauensverletzungen, da\n"
 "                  %s::CmdLine::Ignore-Trust-Violations »true« ist!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1229,7 +1186,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr "Ja"
 
@@ -1238,97 +1195,97 @@ msgstr "Ja"
 #. 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr "Nein"
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Wollen Sie diese Warnung ignorieren und trotzdem weitermachen?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Geben Sie zum Weitermachen »%s«, zum Abbrechen »%s« ein: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Unerwartete Eingabe. Geben Sie entweder »%s« oder »%s« ein.\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Die folgenden Pakete werden EMPFOHLEN, aber NICHT installiert:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 "Die folgenden Pakete wurden VORGESCHLAGEN, werden aber NICHT installiert:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Es werden keine Pakete installiert, aktualisiert oder entfernt.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu Pakete aktualisiert, %lu zusätzlich installiert, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu erneut installiert, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu durch eine ältere Version ersetzt, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu werden entfernt und %lu nicht aktualisiert.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "%sB/%sB an Archiven müssen heruntergeladen werden. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "%sB an Archiven müssen heruntergeladen werden. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Nach dem Entpacken werden %sB zusätzlich belegt sein.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Nach dem Entpacken werden %sB frei werden.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Keine Pakete anzuzeigen -- geben Sie den Paketnamen nach dem »i« an.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Drücken Sie zum Fortsetzen die Eingabetaste."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Keine Pakete anzuzeigen -- geben Sie den Paketnamen nach dem »c« an.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1337,30 +1294,30 @@ msgstr ""
 "Keine Pakete gefunden -- geben Sie null oder mehrere Wurzeln der Suche "
 "gefolgt vom Paket ein.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "j: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "mit der Installation fortfahren"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "Abbrechen und Beenden"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1368,12 +1325,12 @@ msgstr ""
 "Informationen über ein oder mehrere Pakete anzeigen; die Paketnamen sollten "
 "dem »i« folgen."
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1381,39 +1338,39 @@ msgstr ""
 "die Debian-Änderungsprotokolle eines oder mehrerer Pakete anzeigen; die "
 "Paketnamen sollten dem »c« folgen."
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "die Anzeige von Abhängigkeitsinformationen umschalten"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "die Anzeige von Änderungen bei den Paketgrößen umschalten"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "die Anzeige der Versionsnummern umschalten"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1422,27 +1379,27 @@ msgstr ""
 "finden oder erklären, warum die Installation eines Paketes zur Installation "
 "eines anderen Paketes führt."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "starten Sie den automatischen Abhängigkeitsauflöser, um die beschädigten "
 "Abhängigkeiten zu korrigieren."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "die komplett visuelle Oberfläche starten"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1454,49 +1411,49 @@ msgstr ""
 "Paketnamen (oder Mustern) ein. Die Aktion wird auf alle Pakete angewandt, "
 "die Sie aufführen. Die folgenden Aktionen sind verfügbar:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "»+« zum Installieren von Paketen"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "»+M« zum Installieren von Paketen und sofortigem Markieren als automatisch "
 "installiert"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "»-« zum Entfernen von Paketen"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "»_« zum vollständigen Löschen von Paketen"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "»=« zum Setzen von Paketen auf »zurückhalten«"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 "»:« zum Beibehalten von Paketen in ihrem aktuellen Zustand, ohne sie auf "
 "»Zurückhalten« zu setzen"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "»&M« zum Markieren von Paketen als automatisch installiert"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "»&m« zum Markieren von Paketen als manuell installiert"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "»&BD« zum Installieren der Bauabhängigkeiten eines Pakets."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1508,31 +1465,31 @@ msgstr ""
 "Diese Zeichen bieten zusätzliche Informationen über den Status des Pakets "
 "und können jegliche Kombination aus den folgenden Möglichkeiten enthalten:"
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 msgid "'a': the package was automatically installed or removed."
 msgstr "»a«: das Paket wurde automatisch installiert oder entfernt."
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 "»b«: einige der Paketabhängigkeiten werden durch die beabsichtigten "
 "Änderungen verletzt."
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 "»p«: das Paket wird zusätzlich zum Entfernen noch vollständig gelöscht."
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr "»u«: das Paket wird entfernt, da es nicht verwendet wird."
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Befehle:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1541,21 +1498,21 @@ msgstr ""
 "diese selber auflösen oder »n« zum Beenden eingeben."
 
 # TODO: Y should be J (not yet supported)
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Möchten Sie fortsetzen? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Diese Abhängigkeiten manuell auflösen? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Ungültige Antwort. Bitte geben Sie einen gültigen Befehl oder »?« für Hilfe "
 "ein.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1564,7 +1521,7 @@ msgstr ""
 "eines Pakets), »R« zur automatischen Abhängigkeitsauflösung oder »N« zum "
 "Abbrechen ein."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1575,7 +1532,7 @@ msgstr ""
 "Abhängigkeiten werden angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1586,7 +1543,7 @@ msgstr ""
 "Abhängigkeiten werden nicht angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1597,7 +1554,7 @@ msgstr ""
 "Versionen werden angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1608,7 +1565,7 @@ msgstr ""
 "Versionen werden nicht angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1619,7 +1576,7 @@ msgstr ""
 "Größenveränderungen werden angezeigt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1761,6 +1718,11 @@ msgstr "Zumindest ein Paket-/Versions-Paar wurde auf »%c« folgend erwartet."
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Eine Version oder »%s« wurde nach »%s« erwartet."
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Kein solches Paket »%s«"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1923,7 +1885,7 @@ msgstr ""
 "Abhängigkeiten sollen aufgelöst werden, aber es wurde kein "
 "Abhängigkeitsauflöser erzeugt."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1953,7 +1915,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Die folgenden Befehle sind verfügbar:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Datei, in die der Auflösungsstatus geschrieben werden soll: "
 
@@ -1988,7 +1950,7 @@ msgstr ""
 "            Sie können die Suche fortsetzen, aber einige Lösungen\n"
 "            werden nicht erreichbar sein."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -2001,27 +1963,26 @@ msgstr ""
 "  Sie können dieses Problem möglicherweise lösen, indem Sie\n"
 "  Aptitude::ProblemResolver::StepLimit erhöhen (derzeit %d)."
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Auflösen der Abhängigkeiten für die Paketaktualisierung nicht möglich: keine "
 "Lösung gefunden."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr ""
 "Auflösen der Abhängigkeiten für die Paketaktualisierung nicht möglich: %s"
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "iconv für %s fehlgeschlagen.\n"
+msgid "iconv of %s failed"
+msgstr "iconv für %s fehlgeschlagen."
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "search: Sie müssen einen Suchbegriff angeben.\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "search: Sie müssen einen Suchbegriff angeben."
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2064,7 +2025,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Die folgenden Pakete haben verletzte Abhängigkeiten:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2287,7 +2248,7 @@ msgid "Enhances"
 msgstr "Wertet auf"
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Liefert"
 
@@ -2301,15 +2262,9 @@ msgstr "Beschreibung: "
 msgid "Homepage: "
 msgstr "Homepage: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Das Paket %s konnte nicht gefunden werden."
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Das Muster %s konnte nicht ausgewertet werden."
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Keine Pakete gefunden"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2320,14 +2275,13 @@ msgstr "Pakete würden heruntergeladen/installiert/entfernt werden.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Interner Fehler: Sortierung nicht abgeschlossen"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Löschen veralteter heruntergeladener Dateien"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "F: Der »update«-Befehl akzeptiert keine Argumente.\n"
+msgid "The update command takes no arguments"
+msgstr "Der »update«-Befehl akzeptiert keine Argumente."
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2346,126 +2300,147 @@ msgstr ""
 "%s: zu wenig Argumente; zumindest ein Markierungsname und ein Paket wird "
 "erwartet.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Kein Installationskandidat für %s gefunden\n"
+msgid "No candidate version found for %s"
+msgstr "Kein Installationskandidat für %s gefunden."
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Keine aktuelle Version oder Installationskandidat für %s gefunden\n"
+msgid "No current or candidate version found for %s"
+msgstr "Keine aktuelle Version oder Installationskandidat für %s gefunden."
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Es kann kein Archiv »%s« für das Paket »%s« gefunden werden.\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Es kann kein Archiv »%s« für das Paket »%s« gefunden werden."
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Es kann keine Version »%s« des Pakets »%s« gefunden werden.\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Es kann keine Version »%s« des Pakets »%s« gefunden werden."
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
 msgstr ""
-"Interner Fehler: ungültiger Wert %i wurde an cmdline_find_ver übergeben!\n"
+"Interner Fehler: ungültiger Wert %i wurde an cmdline_find_ver übergeben!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr ""
-"Sie können nicht sowohl Archiv als auch Version eines Pakets angeben.\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Sie können nicht sowohl Archiv als auch Version eines Pakets angeben."
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't run pager %s"
-msgid "Couldn't find task '%s'"
-msgstr "Pager »%s« konnte nicht gestartet werden."
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d beschädigt [%+d]"
 msgstr[1] "%d beschädigt [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d aktualisierbares Paket [%+d]"
 msgstr[1] "%d aktualisierbare Pakete [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d Neues [%+d]"
 msgstr[1] "%d Neue [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Aktueller Status: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "Es gibt %d zusätzliches veraltetes Paket."
 msgstr[1] "Es gibt %d zusätzliche veraltete Pakete."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "Es gibt %d zusätzliches veraltetes Paket: "
 msgstr[1] "Es gibt %d zusätzliche veraltete Pakete: "
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Kein Komma nach der Markierung »%s«."
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Das Paket %s konnte nicht gefunden werden."
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't run pager %s"
+msgid "Couldn't find task '%s'"
+msgstr "Pager »%s« konnte nicht gestartet werden."
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Hinweis: Task »%s: %s« wird zur Installation ausgewählt.\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Änderungsprotokoll für »%s« konnte nicht gefunden werden."
+
+#: src/cmdline/cmdline_versions.cc:126
 #, c-format
 msgid "Package %s:"
 msgstr "Paket %s:"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, c-format
 msgid "Source package %s:"
 msgstr "Quellpaket %s:"
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, c-format
 msgid "Archive %s:"
 msgstr "Archiv %s:"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr "--group-by|archive"
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr "--group-by|auto"
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr "--group-by|none"
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr "--group-by|package"
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr "--group-by|source-package"
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr "--group-by|source-version"
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
@@ -2474,10 +2449,9 @@ msgstr ""
 "Ungültiger Paketgruppierungsmodus »%s« (sollte »auto«, »none«, »package« "
 "oder »source-package« sein)"
 
-#: src/cmdline/cmdline_versions.cc:584
-#, c-format
-msgid "versions: You must provide at least one package selector\n"
-msgstr "versions: Sie müssen mindestens einen Paket-Selektor angeben.\n"
+#: src/cmdline/cmdline_versions.cc:578
+msgid "versions: You must provide at least one package selector"
+msgstr "versions: Sie müssen mindestens einen Paket-Selektor angeben."
 
 #: src/cmdline/cmdline_why.cc:290
 msgid "dep_level"
@@ -2499,7 +2473,7 @@ msgstr "Aktuell"
 msgid "Candidate"
 msgstr "Installationskandidat"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Installieren"
 
@@ -2605,23 +2579,20 @@ msgstr "Es kann kein Grund für die Installation von %s gefunden werden.\n"
 msgid "Packages requiring %s:"
 msgstr "Pakete, die %s erfordern:"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Ein Paket namens »%s« existiert nicht."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Einige Suchmuster konnten nicht ausgewertet werden."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
-"%s: dieser Befehl benötigt mindestens ein Argument (das abzufragende "
-"Paket).\n"
+"%s: dieser Befehl benötigt mindestens ein Argument (das abzufragende Paket)."
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2650,11 +2621,11 @@ msgstr "NICHT ERFÃœLLT"
 msgid "UNAVAILABLE"
 msgstr "NICHT VERFÃœGBAR"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Markierungen"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Benutzermarkierungen"
 
@@ -2866,31 +2837,31 @@ msgstr ""
 "Öffnen im Nur-Lesen-Modus. Alle Änderungen, die Sie am Status von Paketen "
 "durchführen, werden VERLOREN gehen!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr "foreign"
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr "same"
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr "allowed"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "main"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr "contrib"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr "non-free"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr "non-US"
 
@@ -2968,39 +2939,47 @@ msgstr ""
 "Ungültige Sicherheitsstufe »%s« (nicht »discard«, »maximum«, »minimum« oder "
 "eine Ganzzahl)."
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "Der Paket-Zwischenspeicher ist nicht verfügbar. Pakete können nicht "
 "heruntergeladen und installiert werden."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 "Interner Fehler: Liste der herunterzuladenden Pakete konnte nicht erzeugt "
 "werden."
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Herunterladen von %s fehlgeschlagen: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Einige Archive konnten nicht heruntergeladen werden; vielleicht »aptitude "
+"update« ausführen oder mit »--fix-missing« probieren?"
+
 # CHECKME
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Dies kann für nichtverfügbare Pakete nicht korrigiert werden."
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Ein Paket konnte nicht installiert werden. Versuch, dies zu lösen:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3154,13 +3133,13 @@ msgstr ""
 "\n"
 "Protokoll abgeschlossen.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr "Zugriff auf Index"
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 msgid "Filtering packages"
 msgstr "Filtern von Paketen"
 
@@ -3272,18 +3251,18 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Die Paketindizes sind defekt. Kein Filename-Feld für Paket %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Änderungsprotokoll für %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "Herunterladen der Änderungsprotokolle fehlgeschlagen: %s"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 msgid "Failed to download changelogs: unexpected exception."
 msgstr ""
 "Herunterladen der Änderungsprotokolle fehlgeschlagen: unerwartete Ausnahme."
@@ -3336,25 +3315,26 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Auswerten der »Cost-Settings«-Zeichenkette fehlgeschlagen: %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Erzeugen der Tag-Datenbank"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr "legacy"
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 msgid "No tag descriptions are available."
 msgstr "Keine Tag-Beschreibungen verfügbar."
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, c-format
 msgid "No description available for %s."
 msgstr "Keine Beschreibung für %s verfügbar."
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr "legacy"
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3500,47 +3480,47 @@ msgstr "Aptitude Paketmanager"
 msgid "_File"
 msgstr "_Datei"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Durchführen geplanter Installations- und Löschvorgänge"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Nach neuen Paketen suchen"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Alle aktualisierbaren Pakete, die nicht zurückgehalten werden, für eine "
 "Aktualisierung markieren"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Vergessen, welche Pakete »neu« sind"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Abbrechen aller nicht abgeschlossenen Installationen, Entfernungen, "
 "Zurückhaltungen und Aktualisierungen."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 "Paketdateien aus dem Paket-Zwischenspeicher löschen, die vorher "
 "heruntergeladen wurden"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 "Paketdateien aus dem Zwischenspeicher löschen, die nicht mehr "
 "heruntergeladen werden können"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Paket-Zwischenspeicher neu laden"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3550,7 +3530,7 @@ msgstr ""
 "»su« ausführen, um root zu werden. Dies wird das Programm neu starten, aber "
 "Ihre Einstellungen werden erhalten bleiben."
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Aptitude verlassen"
 
@@ -3558,7 +3538,7 @@ msgstr "Aptitude verlassen"
 msgid "E_dit"
 msgstr "_Bearbeiten"
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Die letzte Operation oder Gruppe von Operationen rückgängig machen."
 
@@ -3594,7 +3574,7 @@ msgid "_Help"
 msgstr "_Hilfe"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr "Instrumententafel"
 
@@ -3602,19 +3582,19 @@ msgstr "Instrumententafel"
 msgid "Update"
 msgstr "Aktualisierung"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Pakete"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Vorschau"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Auflöser"
 
@@ -3793,7 +3773,7 @@ msgid "Fix Manually"
 msgstr "Manuell beheben"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Paketaktualisierung"
 
@@ -4331,11 +4311,11 @@ msgstr "Installiert"
 msgid "Reinstall"
 msgstr "Erneut installieren"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Durch eine ältere Version ersetzen (Downgrade)"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -4367,7 +4347,7 @@ msgstr "Sie benötigen root-Rechte, um die Paketlisten zu aktualisieren."
 msgid "Download already running."
 msgstr "Download läuft bereits."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Eine Paketlisten-Aktualisierung oder ein Installationsvorgang findet gerade "
@@ -4437,41 +4417,41 @@ msgstr "Fehler in Paket %s"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Nachfrage, ob die Konfigurationsdatei %s ersetzt werden soll"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Herunterladen von Paketen"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr "Beschädigte Pakete"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr "Beschädigte Pakete anzeigen"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr "Abhängigkeiten auflösen"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "%d Paket ist beschädigt."
 msgstr[1] "%d Pakete sind beschädigt."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr "Änderungen anzeigen"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr "Änderungen anwenden"
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4481,60 +4461,60 @@ msgstr[1] "%d Pakete zu installieren"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%d Paket zu entfernen"
 msgstr[1] "%d Pakete zu entfernen"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr "Herunterzuladende Größe: %sB."
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr "Markierungen von %s:\n"
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr "Diese Funktion ist noch nicht implementiert."
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr "Nicht implementiert"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr "Installieren/Aktualisieren"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr "Vollständig löschen"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Beibehalten"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Zurückhalten"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr "Auf automatisch installiert setzen"
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr "Auf manuell installiert setzen"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr "Automatikstatus umschalten"
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4571,7 +4551,7 @@ msgstr "Info"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4617,15 +4597,15 @@ msgstr "%s wird manuell installiert."
 msgid "Cache reloading, please wait..."
 msgstr "Neuladen des Zwischenspeichers, bitte warten ..."
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr "Suchen ..."
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr "Ansicht abschließen"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Ansicht aufbauen"
@@ -5350,108 +5330,109 @@ msgstr "Unbekannter Ausrichtungstyp »%s«"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Sortierregel »%s« akzeptiert keine Argumente."
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Ungültiger leerer Sortierregelname"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Nicht geschlossene »(« in Sortierregel-Beschreibung"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Ungültiger Sortierregel-Typ »%s«"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Multibyte-Zeichenkette nach »%ls« kann nicht dekodiert werden."
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Multibyte-Zeichenkette nach »%s« kann nicht dekodiert werden."
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s kompiliert am %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compiler: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Kompiliert gegen:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt-Version %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  NCurses-Version: unbekannt\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  NCurses-Version: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++-Version: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Ept-Unterstützung aktiviert.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Ept-Unterstützung nicht aktiviert.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  Gtk+-Version %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  Gtk-- Version %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Gtk+-Unterstützung nicht aktiviert.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "  Kompiliert mit Qt %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr "  Läuft auf Qt %s\n"
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Qt-Unterstützung nicht aktiviert.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5459,76 +5440,76 @@ msgstr ""
 "\n"
 "Aktuelle Bibliotheksversionen:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  NCurses-Version: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  cwidget-Version: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Apt-Version: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Aufruf: aptitude [-S dname] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "            aptitude [Optionen] <Aktion> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr "Aktionen (wenn keine angegeben wird, startet Aptitude interaktiv):\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install        Pakete installieren/aktualisieren\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove         Pakete entfernen\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge          Pakete inkl. ihrer Konfigurationsdateien vollständig "
 "löschen\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold           Pakete auf »Zurückhalten« setzen\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold         Einen »Zurückhalten«-Befehl zurücknehmen\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto       Pakete als automatisch installiert markieren\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto     Pakete als manuell installiert markieren\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5536,17 +5517,17 @@ msgid ""
 msgstr ""
 " forbid-version Aktualisierung auf eine bestimmte Paketversion verbieten\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update         Listen neuer/aktualisierbarer Pakete herunterladen\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade   Sichere Paketaktualisierung durchführen\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5555,52 +5536,52 @@ msgstr ""
 " full-upgrade   Paketaktualisierung, dabei ggf. Pakete installieren/"
 "entfernen\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr " build-dep      Bauabhängigkeiten von Paketen installieren\n"
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new     Vergessen, welche Pakete »neu« sind\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search         Paket über den Namen und/oder Ausdruck suchen\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show           Details über ein Paket anzeigen\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " versions       Versionen der angegebenen Pakete anzeigen\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean          Heruntergeladene Paketdateien löschen\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean      Alte heruntergeladene Paketdateien löschen\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog      Änderungsprotokoll (Changelog) eines Pakets anzeigen\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download       Die .deb-Datei eines Pakets herunterladen\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5610,7 +5591,7 @@ msgstr ""
 "aktuell\n"
 "                installierten Pakets\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5621,7 +5602,7 @@ msgstr ""
 "                benötigen, oder warum ein oder mehrere Pakete das gegebene\n"
 "                Paket benötigen\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5635,17 +5616,17 @@ msgstr ""
 "                Pakete zu einem Konflikt mit dem gegebenen Paket führen\n"
 "                würden, falls installiert\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "Optionen:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Dieser Hilfetext\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
@@ -5653,18 +5634,18 @@ msgstr ""
 " --gui          Die GTK-Oberfläche verwenden, selbst wenn dies in der\n"
 "                Konfiguration deaktiviert ist\n"
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 " --no-gui       Nicht die GTK-Oberfläche verwenden, selbst wenn verfügbar\n"
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " --qt           Die Qt-Oberfläche verwenden\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
@@ -5672,12 +5653,12 @@ msgstr ""
 " --no-qt        Nicht die Qt-Oberfläche verwenden, selbst wenn dies in der\n"
 "                Konfiguration aktiviert ist\n"
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Aktionen simulieren, aber nicht wirklich durchführen\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -5685,12 +5666,12 @@ msgstr ""
 " -d             Pakete nur herunterladen, nichts installieren oder "
 "entfernen\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Immer zur Bestätigung nachfragen\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5698,7 +5679,7 @@ msgstr ""
 " -y             Annehmen, dass die Antwort auf einfache ja/nein-Fragen »ja« "
 "ist\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5706,7 +5687,7 @@ msgid ""
 msgstr ""
 " -F format      Format für die Suchergebnisse angeben; vgl. das Handbuch\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5715,40 +5696,40 @@ msgstr ""
 " -O reihenfolge Wie die Suchergebnisse sortiert werden sollen; vgl. das\n"
 "                Handbuch\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr ""
 " -w breite      Die Breite für die Formatierung der Suchergebnisse angeben\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Aggressiv versuchen, beschädigte Pakete zu reparieren\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Anzeigen, welche Version eines Pakets installiert wird\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             Abhängigkeiten automatisch veränderter Pakete anzeigen\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 " -Z             Änderungen bei der installierten Größe jedes Pakets "
 "anzeigen\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5757,7 +5738,7 @@ msgstr ""
 " -v             Mehr Informationen ausgeben (kann mehrfach verwendet "
 "werden)\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
@@ -5765,19 +5746,19 @@ msgstr ""
 " -t [release]   Das »Release« angeben, aus dem Pakete installiert werden\n"
 "                sollen (z.B. stable, unstable, squeeze, ...)\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr " -q             Keine Fortschrittsanzeige im Befehlszeilenmodus\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o opt=wert    Die Konfigurationsoption »schl« direkt setzen\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5787,78 +5768,78 @@ msgstr ""
 "                Angeben, ob »Empfehlungen« wie starke Abhängigkeiten\n"
 "                gehandhabt werden sollen (»with-«) oder nicht (»without-«)\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fname       Die erweiterten Aptitude-Statusinformationen aus »fname« "
 "laden\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Neue Paketlisten beim Start herunterladen\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr "                  (nur Terminal-Oberfläche)\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Installationslauf beim Start durchführen\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Dieses Aptitude hat keine Super-Kuh-Kräfte.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 msgid "trace"
 msgstr "trace"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 msgid "debug"
 msgstr "debug"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:399
+#: src/main.cc:365
 msgid "info"
 msgstr "info"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 msgid "warn"
 msgstr "warn"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:405
+#: src/main.cc:371
 msgid "error"
 msgstr "error"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 msgid "fatal"
 msgstr "fatal"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr "off"
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
@@ -5868,48 +5849,28 @@ msgstr ""
 "»info«, »warn«, »error«, »fatal« oder »off«.)"
 
 #  Should never happen.
-#: src/main.cc:488
+#: src/main.cc:456
 #, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Ungültiger Logger-Name »%s«."
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Nach -q= wurde eine Nummer erwartet\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Nach -q= wurde eine Nummer erwartet, nicht %s.\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o erfordert ein Argument der Form option=wert, angeben wurde %s.\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Kein Komma nach der Markierung »%s«.\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "MERKWÃœRDIG: unbekannten Optionscode erhalten\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr "--show-package-names|never"
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr "--show-package-names|auto"
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr "--show-package-names|always"
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
@@ -5918,29 +5879,29 @@ msgstr ""
 "Ungültiger Wert »%s« für den Paketnamen-Anzeigemodus (sollte »never«, »auto« "
 "oder »always« sein)."
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr "no-summary"
 
-#: src/main.cc:1027
+#: src/main.cc:781
 msgid "first-package"
 msgstr "first-package"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr "first-package-and-type"
 
-#: src/main.cc:1031
+#: src/main.cc:785
 msgid "all-packages"
 msgstr "all-packages"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr "all-packages-with-dep-versions"
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5951,38 +5912,41 @@ msgstr ""
 "»first-package«, »first-package-and-type«, »all-packages« oder »all-packages-"
 "with-dep-versions«."
 
-#: src/main.cc:1079
+#: src/main.cc:831
+#, fuzzy
+#| msgid ""
+#| "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may "
+#| "be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr ""
 "Nur eines von den folgenden darf angegeben werden: --auto-clean-on-startup, "
 "--clean-on-startup, -i oder -u.\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
+#, fuzzy
+#| msgid ""
+#| "-u, -i, and --clean-on-startup may not be specified in command-line mode "
+#| "(eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u, -i und --clean-on-startup dürfen nicht im Befehlszeilenmodus verwendet "
 "werden (z.B. mit »install«)."
 
-#: src/main.cc:1105
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr ""
-"-u, -i und --clean-on-startup dürfen nicht mit einem Befehl verwendet werden."
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Unbekannter Befehl »%s«\n"
+msgid "Unknown command \"%s\""
+msgstr "Unbekannter Befehl »%s«"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Nicht abgefangene Ausnahme: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -6000,7 +5964,7 @@ msgstr "Suchen nach: "
 msgid "Search backwards for: "
 msgstr "Rückwärts suchen nach: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Minesweeper"
 
@@ -6236,7 +6200,7 @@ msgstr "UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 16 29 18 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Paket"
 
@@ -6319,8 +6283,8 @@ msgstr "<N/V>"
 msgid "<none>"
 msgstr "<keine>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtuell"
@@ -6455,7 +6419,7 @@ msgstr "Paketanzeigeformat nach »%ls« kann nicht konvertiert werden."
 msgid "Internal error: Default column string is unparsable"
 msgstr "Interner Fehler: Standard-Spalten-Zeichenkette nicht interpretierbar"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Tasks"
 
@@ -6613,11 +6577,11 @@ msgstr "Trefferindizes müssen eins oder größer sein, nicht »%s«"
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "Trefferindex %ls ist zu groß; verfügbare Gruppen sind (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PAKETE OHNE MARKIERUNG"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6628,10 +6592,6 @@ msgstr ""
 "Datenbank ist nicht vorhanden (die Installation von debtags könnte dieses "
 "Problem beheben)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "FEHLENDE MARKIERUNG"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Quellpaket: "
@@ -7262,7 +7222,7 @@ msgstr "Laden des Zwischenspeichers"
 msgid "Really quit Aptitude?"
 msgstr "Aptitude wirklich beenden?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Das Verhalten von Aptitude ändern"
 
@@ -7346,7 +7306,7 @@ msgstr ""
 msgid "License"
 msgstr "Lizenz"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 "Anzeige der Bedingungen, unter denen Sie Aptitude kopieren und "
@@ -7369,7 +7329,7 @@ msgstr "Online-Hilfe"
 msgid "View a brief introduction to aptitude"
 msgstr "Eine kurze Einführung zu Aptitude anzeigen"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Hilfe"
 
@@ -7398,7 +7358,7 @@ msgstr "Handbuch"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Die Liste häufig gestellter Fragen (Frequently Asked Questions, FAQ)"
 
@@ -7444,15 +7404,15 @@ msgstr ""
 "Inhalt entfernen? Falls Sie »Nein« wählen, werden Sie diese Meldung nicht "
 "erneut sehen."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Den Fortschritt des Paket-Downloads anzeigen"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Paket-Download"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7464,35 +7424,35 @@ msgstr ""
 "Systems gefährden%b. Sie sollten nur dann mit der Installation fortfahren, "
 "wenn Sie sicher sind, dass Sie dies wirklich wollen.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [Version %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Wirklich fortfahren"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Installation abbrechen"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Vorschau der Paketinstallation"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Anzeigen und anpassen der geplanten Aktionen"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Einige Pakete waren beschädigt und wurden repariert:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Zu diesen Abhängigkeitsproblemen gibt es keine Lösung!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7501,7 +7461,7 @@ msgstr ""
 "Während des Versuchs, die Abhängigkeiten aufzulösen, lief die Zeit ab "
 "(drücken Sie »%s«, um es intensiver zu probieren)."
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7509,21 +7469,21 @@ msgstr ""
 "Das Installieren/Entfernen von Paketen erfordert Administrationsrechte, die "
 "Sie derzeit nicht haben. Möchten Sie zum root-Account wechseln?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "»root« werden"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Nicht »root« werden"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "Es wurden keine Pakete zum Installieren, Entfernen oder Aktualisieren "
 "ausgewählt."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7533,20 +7493,20 @@ msgstr ""
 "Pakete könnten aktualisiert werden, aber Sie haben diese nicht ausgewählt. "
 "Geben Sie »U« (nicht »u«!) ein, um diese Pakete zu aktualisieren."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Aktualisieren der Paketlisten"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Den Fortschritt des Paketlisten-Downloads anzeigen"
 
 # FIXME: 'Update of the package list' or 'List the update'?
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Aktualisierung auflisten"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7554,24 +7514,24 @@ msgstr ""
 "Das Aktualisieren der Paketlisten erfordert Administrationsrechte, die Sie "
 "derzeit nicht haben. Möchten Sie zum root-Account wechseln?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Zeit verschwenden (Minensuchspiel)"
 
 #  Erk!  That's weird!
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Leeren, während ein Download läuft, ist nicht erlaubt"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Löschen heruntergeladener Dateien"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Heruntergeladene Dateien wurden gelöscht."
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7579,13 +7539,13 @@ msgstr ""
 "Das Leeren des Paket-Zwischenspeichers erfordert Administrationsrechte, die "
 "Sie derzeit nicht haben. Möchten Sie zum root-Account wechseln?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 "Die Apt-Zwischenspeicher-Datei ist nicht vorhanden, auto-clean kann nicht "
 "durchgeführt werden."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7594,7 +7554,7 @@ msgstr ""
 "Veraltete heruntergeladene Paketdateien wurden gelöscht; %sB wurden "
 "freigegeben."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7602,122 +7562,122 @@ msgstr ""
 "Das Löschen veralteter Paketdateien erfordert Administrationsrechte, die Sie "
 "derzeit nicht haben. Möchten Sie zum root-Account wechseln?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Keine weiteren Lösungen."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Es kann keine anwendbare Lösung gefunden werden."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Die Zeit lief während der Suche nach einer Lösung ab."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Abhängigkeiten auflösen"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Nach Lösungen für verletzte Abhängigkeiten suchen"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "%ls konnte nicht geöffnet werden."
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Fehler beim Ausgeben des Auflösungsstatus"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Installieren/Entfernen von Paketen"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "Paketlisten ^aktualisieren"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Aktualisierbare ^markieren"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "Neue Pakete ^vergessen"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Noch ausstehende Aktionen abbre^chen"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "Paket-Zwischenspeicher komplett ^leeren"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "^Nur veraltete Paketdateien löschen"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "Paket-Zwischenspeicher ^neu laden"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "Minesweeper ^spielen"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^Root werden"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Beenden"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Installieren"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Das ausgewählte Paket zur Installation oder Aktualisierung auswählen"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Entfernen"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Das ausgewählte Paket zum Entfernen auswählen"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Vollständig löschen"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Das ausgewählte Paket und seine Konfigurationsdateien zum Löschen auswählen"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Beibehalten"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Alle Aktionen zu dem gewählten Paket zurücknehmen"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Zurückhalten"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7725,11 +7685,11 @@ msgstr ""
 "Geplante Vorgänge mit dem gewählten Paket zurücknehmen und es vor "
 "zukünftigen Aktualisierungen schützen"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Als ^automatisch installiert markieren"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7737,11 +7697,11 @@ msgstr ""
 "Das ausgewählte Paket als automatisch installiert markieren; es wird dann "
 "automatisch entfernt, wenn keine anderen Pakete mehr davon abhängen"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Als ^manuell installiert markieren"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7749,11 +7709,11 @@ msgstr ""
 "Das ausgewählte Paket als manuell installiert markieren; es wird dann nur "
 "noch auf Ihren Wunsch hin entfernt"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "Ver^sion verbieten"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7761,19 +7721,19 @@ msgstr ""
 "Die Installation des Installationskandidaten dieses Pakets verbieten; neuere "
 "Versionen werden wie üblich installiert"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformationen"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Mehr Informationen zum gewählten Paket"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "Paketinformationen ^umschalten"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7783,61 +7743,61 @@ msgstr ""
 "Beschreibung eines Pakets angezeigt werden, eine Zusammenfassung von dessen "
 "Abhängigkeitsstatus und eine Analyse, warum das Paket benötigt wird."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "Änderungs^protokoll"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 "Das Debian-Änderungsprotokoll (Changelog) für das gewählte Paket anzeigen"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "Lösung ^untersuchen"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Auswerten der aktuell gewählten Lösung des Abhängigkeitsproblems"
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Lösung ^anwenden"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Ausführen der Aktionen der aktuell gewählten Lösung"
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Nächste Lösung"
 
 # FIXME: s/to/for/?
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Die nächste Lösung dieser Abhängigkeitsprobleme wählen"
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^Vorherige Lösung"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Die vorhergehende Lösung dieser Abhängigkeitsprobleme wählen"
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^Erste Lösung"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Die erste Lösung dieser Abhängigkeitsprobleme wählen"
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "^Letzte Lösung"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7845,35 +7805,35 @@ msgstr ""
 "Die letzte Lösung dieser Abhängigkeitsprobleme, die bis jetzt gefunden "
 "wurde, wählen"
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "^Abweisung umschalten"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Umschalten der Ablehnung zur aktuell gewählten Aktion"
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "^Genehmigung umschalten"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Umschalten der Zustimmung zur aktuell gewählten Aktion"
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "Ziel ^betrachten"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Das Paket anzeigen, das von der gewählten Aktion betroffen sein wird"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Abweisen verletzender ^Zurückhaltungen"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7881,137 +7841,137 @@ msgstr ""
 "Alle Aktionen abweisen, die den Status zurückgehaltener Pakete ändern oder "
 "verbotene Versionen installieren würden"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Suchen"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Vorwärts suchen"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "^Rückwärts suchen"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Rückwärts suchen"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "^Weitersuchen"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Die letzte Suche wiederholen"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Erneut ^rückwärts suchen"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Die letzte Suche in entgegengesetzter Richtung wiederholen"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "An^zeige eingrenzen"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Einen Filter auf die Paketliste anwenden"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Löschen des Filters"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Die Paketliste nicht mehr filtern"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "^Beschädigte Pakete suchen"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Das nächste Paket mit verletzten Abhängigkeiten finden"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Einstellungen"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^Oberflächenoptionen"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Einstellungen verändern, die die Benutzeroberfläche betreffen"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Abhängigkeitsbehandlung"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Einstellungen verändern, die die Handhabung von Abhängigkeiten betreffen"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Verschiedenes"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Sonstige Programmeinstellungen ändern"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "Optionen zu^rücksetzen"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Alle Einstellungen auf die Vorgabewerte zurücksetzen"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Nächste"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Nächste Ansicht zeigen"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Vorherige"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Vorherige Ansicht zeigen"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Schließen"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Ansicht schließen"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Neue Paket^ansicht"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Eine neue Paketansicht erzeugen"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "^Empfehlungen überprüfen"
 
 # FIXME it is?
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -8019,89 +7979,89 @@ msgstr ""
 "Anzeige aller zur Installation empfohlenen Pakete, die zurzeit nicht "
 "installiert sind"
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "^Neue einfache Paketansicht"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 "Alle Pakete im System in einer einzelnen nicht kategorisierten Liste anzeigen"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Neuer ^Debtags-Browser"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Pakete nach Debtags-Daten anzeigen"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Neuer Kategorie-^Browser"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Pakete nach Kategorie durchsuchen"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "Ü^ber"
 
 # ummmm...
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Information über Aptitude"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Hilfe"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Online-Hilfe zu Aptitude"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "H^andbuch"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Die detaillierte Anleitung (README, derzeit nur Englisch)"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Neuigkeiten"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Anzeige der wichtigen Änderungen in jeder Version von "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "Lizen^z"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Aktionen"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Suchen"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Optionen"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Ansichten"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8110,11 +8070,11 @@ msgstr ""
 "%ls: Menü %ls: Hilfe %ls: Beenden %ls: Update %ls: Download/Inst./Entf. von "
 "Paketen"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "j"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -8144,11 +8104,53 @@ msgstr "Herunterladen des Änderungsprotokolls von %s fehlgeschlagen: %s"
 msgid "Downloading the changelog of %s"
 msgstr "Herunterladen des Änderungsprotokolls von %s"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr ""
-"Sie können nur die Änderungsprotokolle von offiziellen Debian-Paketen "
-"anzeigen."
+#~ msgid "MISSING TAG"
+#~ msgstr "FEHLENDE MARKIERUNG"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL für Änderungsprotokolle (Changelog)"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Diese Option steuert die Vorlage, die zum Herunterladen von "
+#~ "Änderungsprotokollen von der Debian-Website verwendet wird. Sie müssen "
+#~ "dies nur ändern, falls sich die URL der Änderungsprotokolle ändert."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "»%s« ist kein offizielles Debian-Paket, Änderungsprotokoll kann nicht "
+#~ "angezeigt werden."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Paket namens »%s« konnte nicht gefunden werden."
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Das Muster %s konnte nicht ausgewertet werden."
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Nach -q= wurde eine Nummer erwartet\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Nach -q= wurde eine Nummer erwartet, nicht %s.\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o erfordert ein Argument der Form option=wert, angeben wurde %s.\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "MERKWÃœRDIG: unbekannten Optionscode erhalten\n"
+
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr ""
+#~ "-u, -i und --clean-on-startup dürfen nicht mit einem Befehl verwendet "
+#~ "werden."
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr ""
+#~ "Sie können nur die Änderungsprotokolle von offiziellen Debian-Paketen "
+#~ "anzeigen."
 
 #~ msgid "Couldn't lock list directory..are you root?"
 #~ msgstr "Listenverzeichnis konnte nicht gesperrt werden. Sind Sie »root«?"
@@ -8324,11 +8326,6 @@ msgstr ""
 #~ msgstr "Herunterladen des Changelogs"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Keine Lösung gefunden."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Kann Pakethierarchiedatei %s nicht öffnen"
diff --git a/po/dz.gmo b/po/dz.gmo
index d3516411..3d1282c9 100644
--- a/po/dz.gmo
+++ b/po/dz.gmo
diff --git a/po/dz.po b/po/dz.po
index 0ea9bedd..d5aa9ef9 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 13:17+0800\n"
 "Last-Translator: Tshewang Norbu <bumthap2006@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -316,71 +316,60 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "བསྒྱུར་བཅོས་ལོགསི་ ཚུ་ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འ�བ་་ནི་གི་ཡུ་ཨཱར་ཨེལ�"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "འདི་མ་འབད་བའི་ཧེ་མ་འབད་སྲོལ་ཡོད་མི་གི་ སྔོན་བལྟ་ཅིག་བཀྲམ་སྟོན་འབད�"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "�ུམ་སྒྲིལ་�ོ་ཡིག་ཚུ་དུས་མ�ུན་བཟོ་བའི་ས�བས་ལུ་ �ུམ་སྒྲིལ་ཚུ་ག་\"new\"ཨིན་ན་སེམས་ལས་བརྗེད་དགོ"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "གཞི་བཙུགས་་ཡང་ན་ རྩ་བས�ྲད་ག�ང་པའི་ས�བས་ལུ་ �ུམ་སྒྲིལ་ཚུ་ག་ \"new\" གསརཔ་ཨིན་ན་སེམ་ས་ལས་བརྗེད་"
 "དགོཔ་ཨིན�"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "�བས་ལམ་ར�ྱངམ་ཅིག་-ལྷག་ཟེར་མི་ནང་ལུ་བསྒྱུར་བཅོས་དང་པམ་དེ་བཟོ་བའི་ས�བས་ལུ་ ཉེན་བརྡ་བཀྲམ་སྟོན་མ་འབད�"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "�ེ་དབང་ཅན་གྱི་བྱ་བ་དེ་ རྩ་བ་མེན་མི་ལག་ལེན་པ་སྦེ་ལཱ་འགན་འགྲུབ་ནི་ལུ་དཔའ་བཅམ་པའི་ས�བས་ལུ་ ཉེན་བརྡ་"
 "འབད�"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -388,11 +377,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "ནང་ལུ་བྱ་བ་ཚུ་དྲེན་དེབ་བཀོད་ནིའི་ཡིག་སྣོད�"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -400,11 +389,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "�ུམ་སྒྲིལ་ཅིག་གི་རྟེན་འབྲེལ་དེ་ སེལ་འ�ུ་འབད་བའི་ས�བས་ལུ་ རང་བཞིན་གྱིས་�ོག་ལས་མོས་མ�ུན་འབད�"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -412,12 +401,12 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "ཆག་འགྱོ་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ་ གཞི་བཙུགས་ཡང་ན་ རྩ་བས�ྲད་མ་ག�ང་པའི་ཧེ་མ་ རང་བཞིན་གྱིས་�ོག་ལས་ སྒྲིགས�"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -425,12 +414,12 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 #, fuzzy
 msgid "Install recommended packages automatically"
 msgstr "ངོ་འབྱོར་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ་ རང་བཞིན་གྱིས་�ོག་ལས་གཞི་བཙུགས་འབད�"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -441,11 +430,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "ལག་ལེན་མ་འ�བ་པར་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ་ རང་བཞིན་གྱིས་�ོག་ལས་རྩ་བས�ྲད་ག�ང་�"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -456,22 +445,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -484,19 +473,19 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 #, fuzzy
 #| msgid "^UI options"
 msgid "UI options"
 msgstr "ཡུ་ཨའི་གི་གདམ་��(^M)"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 #, fuzzy
 #| msgid "^Dependency handling"
 msgid "Dependency handling"
 msgstr "རྟེན་འབྲེལ་ལེགས་ས�ྱོང་འ�བ་ནི�(^D)"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "སྣ་ཚོགས"
 
@@ -604,7 +593,7 @@ msgstr "à½�ུམ་སྒྲིལ་ \"%s\"གི་དོན་ལུ་ ཡà
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "ཡིག་སྣོད་ཚུ་ \"%s\" དེ་ནང་ལུ་�ོ་བཀོད་མ་ཚུགས�"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -613,7 +602,7 @@ msgstr ""
 "དྲན་འཛིན:\"%s\", བར་ཅུ་ཡལ་�ུམ་སྒྲིལ་དེ་བྱིན་དོ�\n"
 "      \"%s\",ཧེ་མ་ལས་གཞི་བཙུགས་འབད་དེ་ཡོད�.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -622,7 +611,7 @@ msgstr ""
 "དྲན་འཛིན:\"%s\", བར་ཅུ་ཡལ་�ུམ་སྒྲིལ་དེ་བྱིན་དོ�\n"
 "      \"%s\", ཧེ་མ་ལས་གཞི་བཙུགས་འབད་ནི་ཨིན་པས�\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -631,82 +620,81 @@ msgstr ""
 "\"%s\" �ུམ་སྒྲིལ་གནད་སྡུད་གཞི་རྟེན་དེ་ནང་ལུ་བྱུངམ་ཨིན་ དེ་འབད�་ད་\n"
 "�ུམ་སྒྲིལ་ངོ་མ་མེན་པའི་�ར་ �ུམ་སྒྲིལ་ག་གིས་ཡང་འ་ནི་དེ་མི་བྱིན་དོ་ཡོདཔ་ཨིན�\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\"དེ་ གིས་བྱིན་མི་ བར་ཅུ་ཡལ་�ུམ་སྒྲིལ་ཅིག་ཨིན:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "གཞི་བཙུགས་འབད་ནིའི་དོན་ལུ་ �ྱོད་ཀྱིས་གཅིག་གདམ་�་བར�ྱབ་དགོཔ་ཨིན�\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "�ུམ་སྒྲིལ་ %s དེ་གཞི་བཙུགས་མ་འབད་བར་ཡོདཔ་ལས་ ཡར་བས�ྱེད་དེ་བཀག་དམ་འབད་མི་ཚུགས�\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
 "      virtual package \"%s\"\n"
 msgstr "དྲན་འཛིན:  \"%s\"དེ་ བར་ཅུ་ཡལ་�ུམ་སྒྲིལ་ གྱི་ཚབ་ལུ་སེལ་འ�ུ་འབད་དོ� \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s དེ་ ཞུ་བ་ཕུལ་ཡོད་པའི་�ོན་རིམ་(%s)གུར་ ཧེ་མ་ལས་འདུག\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 #| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s ད་ལྟོ་གཞི་བཙུགས་མ་འབད་བས� དེ་འབད�་ལས་ འ་ནི་དེ་སླར་གཞི་བཙུགས་མི་འབད� \n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 #| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s དེ་ ཞུ་བ་ཕུལ་ཡོད་པའི་�ོན་རིམ་(%s)གུར་ ཧེ་མ་ལས་འདུག\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s ད་ལྟོ་གཞི་བཙུགས་མ་འབད་བས� དེ་འབད�་ལས་ འ་ནི་དེ་སླར་གཞི་བཙུགས་མི་འབད� \n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "�ུམ་སྒྲིལ་ %s དེ་གཞི་བཙུགས་མ་འབད་བས� དེ་འབད�་ལས་ འ་ནི་དེ་རྩ་བས�ྲད་མི་ག�ང་� \n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "�ུམ་སྒྲིལ་ %s དེ་གཞི་བཙུགས་མ་འབད་བར་ཡོདཔ་ལས་ ཡར་བས�ྱེད་དེ་བཀག་དམ་འབད་མི་ཚུགས�\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "�ུམ་སྒྲིལ་ %s དེ་ཡར་བས�ྱེད་མ་འབད་བར་ཡོདཔ་ལས་ ཡར་བས�ྱེད་དེ་བཀག་དམ་འབད་མི་ཚུགས� \n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "དྲན་འཛིན: གཞིི་བཙུགས་ཀྱི་དོན་ལུ་ ལཱ་གཡོག ་\"%s: %s\" དེ་སེལ་འ�ུ་འབད་དོ� \n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "�ྱོད་ཀྱིས་�ུམ་སྒྲིལ་�ོན་རིམ་དེ་ 'install' བརྡ་བཀོད་ཡང་ན་ 'forbid-version' བརྡ་བཀོད་དང་གཅིག་"
-"�ར་ར�ྱངམ་ཅིག་གསལ་བཀོཀད་འབད་ཚུགས� \n"
+"�ར་ར�ྱངམ་ཅིག་གསལ་བཀོཀད་འབད་ཚུགས�"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
 msgstr ""
-"�ྱོད་ཀྱིས་ �ུམ་སྒྲིལ་ཡིག་མཛོད་དེ་ 'install' བརྡ་བཀོད་དང་གཅིག་�ར་ར�ྱངམ་ཅིག་གསལ་བཀོད་འབད་ཚུགས� \n"
+"�ྱོད་ཀྱིས་ �ུམ་སྒྲིལ་ཡིག་མཛོད་དེ་ 'install' བརྡ་བཀོད་དང་གཅིག་�ར་ར�ྱངམ་ཅིག་གསལ་བཀོད་འབད་ཚུགས�"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -715,7 +703,7 @@ msgstr ""
 "�ུམ་སྒྲིལ་ \"%s\",དེ་�ོབ་མ་ཚུགས� ༤༠་ལས་ལྷག་པའི་ \n"
 "�ུམ་སྒྲིལ་ཚུ་གི་མིང་ནང་ལུ་ \"%s\" དེ་ཡོདཔ་ཨིན� \n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -724,12 +712,12 @@ msgstr ""
 "�ུམ་སྒྲིལ་་\"%s\" དེ་�ོབ་མ་ཚུགས� ཨིན་རུང་ འོག་གི་\n"
 "�ུམ་སྒྲིལ་ཚུ་གི་མིང་ནང་ལུ་ \"%s\"དེ་ཡོདཔ་ཨིན:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "�ུམ་སྒྲིལ་གྱི་མིིང་ཡང་ན་ འགྲེལ་བཤད་ཀྱིས་ \"%s\" དང་མ�ུན་སྒྲིག་ཡོད་མི་ག་ཡང་མ་�ོབ� \n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -747,7 +735,7 @@ msgstr ""
 "\"%s\"དང་མ�ུན་སྒྲིག་ཡོད་མི་�ུམ་སྒྲིལ་ཅིག་ཡང་མ་�ོབ� ཨིན་རུང་ འོག་གི་ \n"
 "�ུམ་སྒྲིག་ཚུ་གི་འགྲེལ་བཤད་ཚུ་ནང་ལུ་ \"%s\" ཡོདཔ་ཨིན:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "ཡིག་འབྲུའིི་བྱ་བ་བྱང་ཉེས�'%c'\n"
@@ -772,7 +760,7 @@ msgstr "ཨི་ཨཱར་ཨཱར�"
 msgid "Changelog download failed: %s"
 msgstr "%sགི་བསྒྱུར་བཅོས་དྲན་དེབ�"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "དྲན་ཤེས་ཅན་གྱི་ཤོག་ལེབ་པ་དེ་ ལག་ལེན་འ�བ་མ་ཚུགས� འ་ནི་འདི་ལཱ་གཡོག་འབད་ནིའི་ཌེ་བེ་ཡན་རིམ་ལུགས་ཨིན་"
@@ -780,96 +768,80 @@ msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s དེ་གཞུང་འབྲེལ་གྱི་ཌེ་བི་ཡཱན་�ུམ་སྒྲིལ་ཅིག་མེནམ་ལས་ དེ་གི་བསྒྱུར་བཅོས་དྲན་དེབ་བཀྲམ་སྟོན་འབད་མི་ཚུགས�"
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "%s གི་དོན་ལུ་ བསྒྱུར་བཅོས་དྲན་དེབ་�ོབ་མ་ཚུགས�"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 #| msgid "Couldn't find a changelog for %s"
 msgid "Couldn't run pager %s"
 msgstr "%s གི་དོན་ལུ་ བསྒྱུར་བཅོས་དྲན་དེབ་�ོབ་མ་ཚུགས�"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "ཨི: བརྡ་བཀོད་རྩ་བ་ལས་སྒྲུབ་རྟགས་མི་འབག\n"
+msgid "The clean command takes no arguments"
+msgstr "བརྡ་བཀོད་རྩ་བ་ལས་སྒྲུབ་རྟགས་མི་འབག"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "%s* %spartial/* བ�ོན་ག�ང་�\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 #| msgid "Unable to look up your home directory, saving to /tmp/function_pkgs!"
 msgid "Unable to lock the download directory"
 msgstr "�ྱོད་ཀྱི་སྣོད་�ོའི་�ྱིམ་དེ་ལུ་བལྟ་མ་ཚུགས� དེ་/tmp/function_pkgsལུ་སྲུང་བཞག་འབད་དོ་ཡ!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "%s %s [%sB] བ�ོན་ག�ང་�\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "ཨི:རང་བཞིན་ཡང་དག་བརྡ་བཀོད་གིས་སྒྲུབ་རྟགས་མི་འབག\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "རང་བཞིན་ཡང་དག་བརྡ་བཀོད་གིས་སྒྲུབ་རྟགས་མི་འབག"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "ཌིཀསི་བར་སྟོང་ %sབི་ རང་དབང་སྦེེ་བཞག་ནིའི་གོ་ས�བས་ཡོད� \n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "ཌིཀསི་བར་སྟོང་གི་་%sབི་ རང་དབང་སབེ་བཞག་ནུག \n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "ནུས་མེད་བཀོལ་སྤྱོད་ %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "རེ་འདུན་མེད་པའི་ དཔེ་གཞི་སྒྲུབ་རྟགས་ཀྱི་རྗེས་སུ་འབྲངས་ནི�\"keep-all\""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, fuzzy, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+#, fuzzy
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr "རྟེན་འབྲེལ་ཚུ་མོས་མ�ུན་འབད་མ་ཚུགས�"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "བར་བཤོལ�\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr ""
-"ཕབ་ལེན:ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ �ྱོད་ཀྱིས་ཉུང་ཤོས་རང་�ུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོཔ་ཨིན� \n"
+msgid "download: you must specify at least one package to download"
+msgstr "ཕབ་ལེན:ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ �ྱོད་ཀྱིས་ཉུང་ཤོས་རང་�ུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོཔ་ཨིན�"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "འབྱུང་�ུངས་ཀྱི་�ོ་ཡིག་ལྷག་མ་ཚུགས�"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "\"%s\"ཟེར་མིང་བ�གས་ཡོད་མི་�ུམ་སྒྲིལ་དེ་�ོབ་མ་ཚུགས�"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -917,30 +889,21 @@ msgid "[Working]"
 msgstr "[ལཱ་ཡགོག་འབད་དོ]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "\"%s\" བཟུམ་གྱི་�ུམ་སྒྲིལ་མེད�"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "ཨི:བརྗེད་པའི་ བརྡ་བཀོད་གསརཔ་དེ་གིས་སྒྲུབ་རྟགས་མི་འབག\n"
+msgid "The forget-new command takes no arguments"
+msgstr "བརྗེད་པའི་ བརྡ་བཀོད་གསརཔ་དེ་གིས་སྒྲུབ་རྟགས་མི་འབག"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "�ུམ་སྒྲིལ་ཚུ་ག་ཆི་གསརཔ་ཨིན་ན་ སེམས་�ར་ལས་བརྗེད་ནིའི་ཉེན་�་ཡོད� \n"
@@ -1052,17 +1015,17 @@ msgstr "འོག་ལུ་ཡོད་མི་�ུམ་སྒྲིལ་
 msgid "The following partially installed packages will be configured:"
 msgstr "འོག་ལུ་ཡོད་མི་�ུམ་སྒྲིལ་དེ་ཚུ་ཡར་བས�ྱེད་འབད་ནི་ཨིན:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "འོག་ལུ་ཡོད་མི་་ཉེར་མ�ོའི་�ུམ་སྒྲིལ་ཚུ་རྩ་བས�ྲད་ག�ངའོང་!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "འོག་ལུ་ཡོད་མི་་ཉེར་མ�ོའི་�ུམ་སྒྲིལ་ཚུ་ བྱ་བ་འདི་གིས་བཅག་ག�ང་འོང་\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1071,16 +1034,16 @@ msgstr ""
 "ཉེན་བརྡ: བྱ་བ་འདི་ལཱ་དགན་འགྲུབ་མི་དེ་གིས་  �ྱོད་ཀྱི་རིམ་ལུགས་དེ་བཅག་ནིའི་ཉེན་�་ཡོདཔ་ཨིན!\n"
 "�ྱོད་ཀྱིས་�ྱོད་ག་ཅི་འབད�་ཨིན་ན་�ག་�ག་སྦེ་མ་ཤེས་ཚུན་ཚོད་ འཕྲོ་མ�ུད་མ་འབད!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "འདི་གནས་ས�བས་གནམ་མེད་ས་མེད་བྱང་ཉེས་ཅིག་ཨིན་པས་ཟེར་ང་གིས་ཤེས�"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "འཕྲོ་མ�ུད་ནིའི་དོན་ལུ་ ཚིག་ཚན་\"%s\"དེ་ཡིག་དཔར་ར�ྱབས�:\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1091,7 +1054,7 @@ msgid ""
 "\n"
 msgstr "ཉེན་བརྡ: འོག་ལུ་ཡོད་མི་�ུམ་སྒྲིལ་ཚུ་གི་ བློ་ག�ད་མ་ཚུགས་པའི་�ོན་རིམ་དེ་གཞི་བཙུགས་འབད་འོང་!\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1100,7 +1063,7 @@ msgstr ""
 "*** ཉེན་བརྡ་ ***   བློ་ག�ད་འགལ་བ་འདི་ཚུ་སྣང་མེད་བཞག་དོ་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་\n"
 "          %s::CmdLine::སྣང་མེད་-བློ་ག�ད་-འགལ་བ་དེ་ 'true'!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1113,7 +1076,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1122,129 +1085,129 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "�ྱོད་ཀྱིས་ཉེན་བརྡ་དེ་སྣང་མེད་འབད་བཞག་སྟེ་ གང་རུང་སྦེ་འཕྲོ་མ�ུད་ནི་ཨིན་ན?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr ""
 "འཕྲོ་མ�ུད་ནིའི་དོན་ལུ་ \"%s\";དེ་�ོ་བཀོད་འབད� བར་བཤོལ་འབད་ནིའི་དོན་ལུ་\"%s\": དོ་�ོ་བཀོད་འབད�"
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr ""
 "ངོས་འཛིནམ་འབད་བར་ཡོད་མི་ ཨིན་པུཊི�  \"%s\" ཡང་ན་ \"%s\" གཉིས་ལས་ག་འབད་རུང་ཅིག་�ོ་"
 "བཀོདའབད�\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "འོག་ལུ་ཡོད་མི་�ུམ་སྒྲིལ་ཚུ་འོས་སྦྱོར་འབད་ནུག དེ་འབད�་ད་ གཞི་བཙུགས་མི་འབད:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "འོག་ལུ་ཡོད་མི་�ུམ་སྒྲིལ་ཚུ་བསམ་འཆར་བཀོད་ཚར་མི་ཚུ་ཨིན་ དེ་འབད�་ད་ གཞི་བཙུགས་མི་འབད:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "�ུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་དང་ ཡར་བས�ྱེད་ ཡང་ན་ རྩ་བས�ྲད་ག�ང་འོང་�\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu �ུམ་སྒྲིལ་ཚུ་ཡར་བས�ྱེད་འབད་ཡོདཔ� %lu གསརཔ་གཞི་བཙུགས་འབད་ཡོདཔ�"
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu སླར་གཞི་བཙུགས་འབད་ཡོདཔ�"
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu་མར་ཕབ་འབད་ཡོདཔ�"
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "རྩ་བས�ྲད་འབད་ནི་གི་ %lu དང་ %lu ཡར་བས�ྱེད་མ་འབད་བར་ཡོདཔ�\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "ཡིག་མཛོད་ཚུ་གི་%sB/%sB དེ་ལེན་དགོཔ་ཨིན�"
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "ཡིག་མཛོད་ཚུ་གི་%sB ལེན་དགོཔ་ཨིན�"
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "སྒམ་བཤུབ་ཚར་ཞིནམ་ལས་ %sB དེ་ལག་ལེན་འ�བ་འོང་�\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "སྒམ་བཤུབ་ཚར་ཞིནམ་ལས་%sBདེ་རང་དབང་སྦེ་བཞག་འོང་�\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "�ུམ་སྒྲིལ་ཚུ་སྟོན་ནི་མེད --  'i' གི་ཤུལ་ལས་གྲལ་�ིག་གུར་�ུམ་སྒྲིལ་ཚུ་གི་མིང་�ོབཀད་འབད�\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "འཕྲོ་མ�ུད་ནིའི་དོན་ལུ་ སལར་ལལོག་ལུ་ཨེབ་ག�ང་འབད�"
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "�ུམ་སྒྲིལ་ཚུ་མ་�ོབ་་--  'c'་གི་ཤུལ་ལས་གྲལ་�ིག་གུར་�ུམ་སྒྲིལ་དེ་གི་ཚུ་མིང་ཚུ་�ོ་བཀོད་འབད�\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "གཞི་བཙུགས་དེ་འཕྲོ་མ�ུད་འབད�"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "བར་བཤོལ་དང་གཤག་ནི�"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1252,12 +1215,12 @@ msgstr ""
 "གཅིག་ཡང་ན་ དེ་ལས་ལྷག་སྟེ་ཡོད་མི་�ུམ་སྒྲིལ་ཚུ་གི་ས�ོར་ལས་བརྡ་དོན་ཚུ་སྟོན: �ུམ་སྒྲིལ་མིང་དེ་གིས་ 'i' གི་རྗེས་"
 "སུ་འབྲངས་དགོཔ་ཨིན�"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1265,63 +1228,63 @@ msgstr ""
 "གཅིག་ཡང་ན་དེ་ལས་ལྷག་སྟེ་ཡོད་མི་�ུམ་སྒྲིལ་ཚུ་གི་ ཌེ་བི་ཡཱན་ བསྒྱུར་བཅོས་དྲན་དེབ་ཚུ་སྟོན; �ུམ་སྒྲིལ་མིང་དེ་"
 "གིས་ 'c'་གི་རྗེས་སུ་འབྲངས་དགོཔ་ཨིན�"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "རྟེན་འབྲེལ་བརྡ་དོན་གྱི་བཀྲམ་སྟོན་དེ་སོར་སྟོན་འབད�"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "བསྒྱུར་བཅོས་ཚུ་གི་བཀྲམ་སྟོན་དེ་�ུམ་སྒྲིལ་ཚད་ཚུ་གི་ནང་ལུ་སོར་སྟོན་འབད�"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "�ོན་རིམ་ཨང་གྲངས་ཚུ་གི་བཀྲམ་སྟོན་དེ་སོར་སྟོན་འབད�"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "མ�ོང་བའི་ངོས་འདྲ་བ་ཆ་ཚང་དེ་�ོ་བཀོད་འབད�"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1333,47 +1296,47 @@ msgstr ""
 "ཡིག་འབྲུ་དེ་ཡིག་དཔར་ར�ྱབས� བྱ་བ་དེ་ �ྱོད་ཀྱིས་�ོ་བཀོད་འབད་དེ་ཡོད་པའི་�ུམ་སྒྲིལ་ཆ་མཉམ་ལུ་འཇུག་སྤྱོད་འབད་"
 "འོང་� འོག་ལུ་ཡོད་མི་བྱ་བ་ཚུ་འ�ོབ་ཚུགས:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "�ུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་འབད་ནིའི་དོན་ལུ '+' "
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "�ུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་འབད་ནིའི་དོན་ལུ་ '+M' དང་ དེ་ཚུ་རང་བཞིན་གྱིས་གཞི་བཙུགས་འབད་དེ་ཡོད་དོ་བཟུམ་"
 "སྦེ་ དེ་འཕྲལ་ལས་ཟུར་རྟགས་བཀལ�"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "�ུམ་སྒྲིལ་ཚུ་རྩ་བས�ྲད་ག�ང་ནིའི་དོན་ལུ་ '-'"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "�ུམ་སྒྲིལ་ཚུ་ཕྱིར་བས�ྲད་འབད་ནིའི་དོན་ལུ་ '_' "
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "�ུམ་སྒྲིལ་ཚུ་འཆང་ནིའི་གུར་ཞབག་ནིའི་དོན་ལུ་ '='"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "�ུམ་སྒྲིལ་ཚུ་འཆང་ནིའི་གུར་མ་བཞག་པར་�ོང་རའི་ད་ལྟོ་གི་གནས་ལུགས་གུར་བཞག་ནིའི་དོན་ལུ་ ':'"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "རང་བཞིན་གྱིས་གཞི་བཙུགས་འབད་དེ་ཡོདཔ་བཟུམ་སྦེ་རྟགས་བཀལ་ནིའི་དོན་ལུ་ '&M'"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "�ུམ་སྒྲིལ་ཚུ་ལག་�ོག་ལས་གཞི་བཙུགས་འབད་དེ་ཡོདཔ་བཟུམ་སྦེ་རྟགས་བཀལ་ནིའི་དོན་ལུ་ '&m'"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1381,54 +1344,54 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 #| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "རང་བཞིན་གྱིས་གཞི་བཙུགས་འབད་དེ་ཡོདཔ་བཟུམ་སྦེ་རྟགས་བཀལ་ནིའི་དོན་ལུ་ '&M'"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "བརྡ་བཀོད:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "�ྱོད་ཀྱིས་འཕྲོ་མ�ུད་འབད་ནི་ཨིན་ན་? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "ནུས་མེད་ལན� གྲོགས་རམ་གྱི་དོན་ལུ་ནུས་ཅན་བརྡ་བཀོད་ཡང་ན་ '?' ཅིག་�ོ་བཀོད་འབད�\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1439,7 +1402,7 @@ msgstr ""
 "རྟེན་འབྲེལ་བྲད་དོན་དེ་སྟོན་འོང་�\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1450,7 +1413,7 @@ msgstr ""
 "རྟེན་འབྲེལ་བརྡ་དོན་དེ་སྟོན་འོང་�\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1461,7 +1424,7 @@ msgstr ""
 "�ོན་རིམ་དེ་སྟོན་འོང་�\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1472,7 +1435,7 @@ msgstr ""
 "�ོབ་རིམ་དེ་སྟོན་འོང་�\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1483,7 +1446,7 @@ msgstr ""
 "ཚད་ཀྱི་བསྒྱུར་བཅོས་ཚུ་སྟོན་འོང�\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1624,6 +1587,11 @@ msgstr " '%c' གི་རྗེས་སུ་འབྲངས་མི་ ཉà½
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "\"%s\" གི་ཤུལ་ལས་�ོནརིམ་ཅིག་རེ་འདུན་བས�ྱེད་ཅི�"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "\"%s\" བཟུམ་གྱི་�ུམ་སྒྲིལ་མེད�"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1776,7 +1744,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1804,7 +1772,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "འོག་ལུ་ཡོད་མི་བརྡ་བཀོད་ཚུ་འ�ོབ་ཚུགས:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "དེ་ལུ་ མོས་མ�ུན་པའི་གནས་ལུགས་འབྲི་ནིའི་དོན་ལུ་ ཡག་སྣོད:"
 
@@ -1837,7 +1805,7 @@ msgstr ""
 "***འཛོལ་བ:ཚུབ་ཆེན་དམིགས་གསལ་གྱིས་འབལ་ཤོལ་འཚོལ��ྱོད་ཀྱི་འཕྲོ་འ�ུད་དེ་འཚོལ་ཞིབ་འབད དེ་འབད�་ད་�བས་"
 "ཤེས་གཞན་མི་ཚུ་གི་ལྷོད་མི་ཚུགས�"
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1846,25 +1814,24 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "རྟེན་འབྲེལ་མོས་མ�ུན་འབད་མ་ཚུགས! བཀོག་བཞག་དོ..."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "རྟེན་འབྲེལ་ཚུ་མོས་མ�ུན་འབད་མ་ཚུགས�"
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "%s གི་ངོས་དཔར་�ི་འ�ུས་ཤོར་བྱུང་ཡོདཔ�\n"
+msgid "iconv of %s failed"
+msgstr "%s གི་ངོས་དཔར་�ི་འ�ུས་ཤོར་བྱུང་ཡོདཔ�"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "འཚོལ་ཞིབ་འབད: �ྱོད་ཀྱིས་ཉུང་ཤོས་རང་འཚོལ་ཞིབ་ཀྱི་ལམ་ལུགས་གཅིག་བྱིན་དགོ\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "འཚོལ་ཞིབ་འབད: �ྱོད་ཀྱིས་ཉུང་ཤོས་རང་འཚོལ་ཞིབ་ཀྱི་ལམ་ལུགས་གཅིག་བྱིན་དགོ"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1909,7 +1876,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "འོག་ལུ་ཡོད་མི་�ུམ་སྒྲིལ་ཚུ་གིས་གཞན་རྟེན་དང་མ་ཕྱེད་པས:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<སྟོང་ཆ�>"
@@ -2134,7 +2101,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "བྱིནམ་ཨིན�"
 
@@ -2148,15 +2115,9 @@ msgstr "འགྲེལ་བཤད: "
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "�ུམ་སྒྲིལ་%sདེ་ག་ཡོད་འཚོལ་མ་ཚུགས�"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "དཔེ་གཞི་%s་དེ་མིང་དཔྱད་འབད་མ་ཚུགས�"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "�ུམ་སྒྲིལ་ཚུ་མ་�ོབ�"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2167,14 +2128,13 @@ msgstr "à½�ུམ་སྒྲིལ་ཚུ་ཕབ་ལེན/གཞི་à½
 msgid "Internal Error, Ordering didn't finish"
 msgstr "ནང་འ�ོད་འཛོལ་བ་� གོ་རིམ་སྒྲིག་ནི་དེ་མཇུག་མ་བསྡུ་བས�"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "ཕན་མེད་ཕབ་ལེན་འབད་ཡོད་པའི་ཡིག་སྣོད་ཚུ་བ�ོན་ག�ང་དོ�"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "ཨི: བརྡ་བཀོད་དུས་མ�ུན་བཟོ་མི་དེ་གིས་སྒྲུབ་རྟགས་མི་འབག\n"
+msgid "The update command takes no arguments"
+msgstr "བརྡ་བཀོད་དུས་མ�ུན་བཟོ་མི་དེ་གིས་སྒྲུབ་རྟགས་མི་འབག"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, fuzzy, c-format
@@ -2193,137 +2153,159 @@ msgstr "à½�ུམ་སྒྲིལ་\"%s\"གི་དོན་ལུ་ à½�à½
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
-#, c-format
-msgid "No candidate version found for %s\n"
-msgstr "%sགི་དོན་ལུ་ མི་ངོའི་�ོན་རིམ་མ་�ོབ�\n"
-
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "%sགི་དོན་ལུ་ ད་ལྟོའི་ཡང་ན་མི་ངོའི་�ོན་རིམ་མ་�ོབ�\n"
+msgid "No candidate version found for %s"
+msgstr "%sགི་དོན་ལུ་ མི་ངོའི་�ོན་རིམ་མ་�ོབ�"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "�ུམ་སྒྲིལ་ \"%s\"གི་དོན་ལུ་ ཡིག་མཛོད་\"%s\"དེ་དོབ་མ་ཚུགས�\n"
+msgid "No current or candidate version found for %s"
+msgstr "%sགི་དོན་ལུ་ ད་ལྟོའི་ཡང་ན་མི་ངོའི་�ོན་རིམ་མ་�ོབ�"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "�ུམ་སྒྲིལ་\"%s\"གི་དོན་ལུ་ �ོན་རིམ་ \"%s\" དེ་�ོབ་མ་ཚུགས�\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "�ུམ་སྒྲིལ་ \"%s\"གི་དོན་ལུ་ ཡིག་མཛོད་\"%s\"དེ་དོབ་མ་ཚུགས�"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "ནག་འ�ོད་འཛོལ་བ: cmdline_find_ver ལུ་ནུས་མེད་གནས་གོང་%iརྩིས་སྤྲོད་འབད་ནུག་ཡ!\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "�ུམ་སྒྲིལ་\"%s\"གི་དོན་ལུ་ �ོན་རིམ་ \"%s\" དེ་�ོབ་མ་ཚུགས�"
 
-#: src/cmdline/cmdline_util.cc:239
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "�ྱོད་ཀྱིས་�ུམ་སྒྲིལ་ཅིག་གི་དོན་ལུ་ ཡིག་མཛོད་དང་�ོན་རིམ་གཉིས་ཆ་རང་གསལ་བཀོད་འབད་མི་ཚུགས�\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "ནག་འ�ོད་འཛོལ་བ: cmdline_find_ver ལུ་ནུས་མེད་གནས་གོང་%iརྩིས་སྤྲོད་འབད་ནུག་ཡ!"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't find a changelog for %s"
-msgid "Couldn't find task '%s'"
-msgstr "%s གི་དོན་ལུ་ བསྒྱུར་བཅོས་དྲན་དེབ་�ོབ་མ་ཚུགས�"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "�ྱོད་ཀྱིས་�ུམ་སྒྲིལ་ཅིག་གི་དོན་ལུ་ ཡིག་མཛོད་དང་�ོན་རིམ་གཉིས་ཆ་རང་གསལ་བཀོད་འབད་མི་ཚུགས�"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "�ུམ་སྒྲིལ་%sདེ་ག་ཡོད་འཚོལ་མ་ཚུགས�"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find task '%s'"
+msgstr "%s གི་དོན་ལུ་ བསྒྱུར་བཅོས་དྲན་དེབ་�ོབ་མ་ཚུགས�"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "དྲན་འཛིན: གཞིི་བཙུགས་ཀྱི་དོན་ལུ་ ལཱ་གཡོག ་\"%s: %s\" དེ་སེལ་འ�ུ་འབད་དོ� \n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "%s གི་དོན་ལུ་ བསྒྱུར་བཅོས་དྲན་དེབ་�ོབ་མ་ཚུགས�"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 #| msgid "Packages"
 msgid "Package %s:"
 msgstr "�ུམ་སྒྲིལ་ཚུ�"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 #| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "�ུམ་སྒྲིལ་གྱི་འབྱུང་�ུངས:"
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 #| msgid "Archive"
 msgid "Archive %s:"
 msgstr "ཡིག་མཛོད�"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
 #| msgid "search: You must provide at least one search term\n"
-msgid "versions: You must provide at least one package selector\n"
+msgid "versions: You must provide at least one package selector"
 msgstr "འཚོལ་ཞིབ་འབད: �ྱོད་ཀྱིས་ཉུང་ཤོས་རང་འཚོལ་ཞིབ་ཀྱི་ལམ་ལུགས་གཅིག་བྱིན་དགོ\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2352,7 +2334,7 @@ msgstr ""
 msgid "Candidate"
 msgstr "CandVer"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "གཞི་བཙུགས�"
 
@@ -2460,21 +2442,19 @@ msgstr "འཇུག་སྤྱོད་འབད་ནིའི་དོན་
 msgid "Packages requiring %s:"
 msgstr "%sདེ་ལུ་བརྟེན་སྡོད་མི་�ུམ་སྒྲིལ་ཚུ�"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, fuzzy, c-format
 msgid "No package named \"%s\" exists."
 msgstr "\"%s\"ཟེར་མིང་བ�གས་ཡོད་མི་�ུམ་སྒྲིལ་དེ་�ོབ་མ་ཚུགས�"
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 #, fuzzy
 msgid "Unable to parse some match patterns."
 msgstr "དཔེ་གཞི་%s་དེ་མིང་དཔྱད་འབད་མ་ཚུགས�"
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 
 #: src/cmdline/cmdline_why.h:212
@@ -2502,11 +2482,11 @@ msgstr "ངལ་རངས་མ་བྱུང་�"
 msgid "UNAVAILABLE"
 msgstr "འ�ོབ་ཚུགསཔ་སྦེ་མེད�"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "ངོ་རྟགས་ཚུ�"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 #, fuzzy
 #| msgid "Tags"
 msgid "User Tags"
@@ -2717,31 +2697,31 @@ msgstr ""
 "འདྲ་མཛོད་ཡཡིག་སྣོད་དེ་བསྡམ་བཞག་མ་ཚུགས� �བས་ལམ་ར�ངམ་ཅིག་ལྷག་ཟེར་མི་ནང་ལུ་ �་ཕྱེ་དོ� �ྱོད་ཀྱིས་ �ུམ་"
 "སྒྲིལ་ཚུ་གི་གནས་ལུགས་ལུ་བསྒྱུར་བཅོས་ག་ཅི་བཟོ་རུང་ཉམས་སྲུང་མི་འབད་ཡ!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "ངོ་མ�"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2808,34 +2788,40 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr "�ུམ་སྒྲིལ་འདྲ་མཛོད་དེ་འ�ོབ་མི་ཚུགས� �ུམ་སྒྲིལ་ཚུ་ཕབ་ལེན་འབད་ནི་དང་གཞི་བབཙུགས་འབད་མ་ཚུགས�"
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "ནང་འ�ོད་འཛོལ་བ་: ཕབ་ལེན་ལུ་�ུམ་སྒྲིལ་ཚུ་གི་�ོ་ཡིག་བཟོ་བ�ོན་འབད་མ་ཚུགས�"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "%s: %sལུ་་ལེན་ནི་དེ་འ�ུས་ཤོར་བྱུང་ནུག"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "འ�ོབ་མ་ཚུགས་པའི་�ུམ་སྒྲིལ་ཚུ་གི་དོན་ལུ་ ནོར་བཅོས་འབད་མི་ཚུགས་པས�"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "�ུམ་སྒྲིལ་གཞི་བཙུགས་འབད་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ནུག སླར་གསོ་འབད་ནི་ལུ་འབད་རྩོལ་བས�ྱེད་དོ�"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2988,13 +2974,13 @@ msgstr ""
 "\n"
 "མཇུག་མ་བསྡུ་མི་བསྡམ་བཞག.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 #| msgid "Downloading packages"
 msgid "Filtering packages"
@@ -3109,19 +3095,19 @@ msgid ""
 msgstr ""
 "�ུམ་སྒྲིལ་ཟུར་�ོའི་ཡིག་སྣོད་ཚུ་ངན་ཅན་ལུ་གྱུར་སོང་ནུག ཡིག་སྣོད་མིང་མེད: �ུམ་སྒྲིལ་%s དེ་གི་དོན་ལུ་ས་སྒོ�"
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "%sགི་བསྒྱུར་བཅོས་དྲན་དེབ�"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "བསྒྱུར་བཅོས་ལོགསི་ ཚུ་ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འ�བ་་ནི་གི་ཡུ་ཨཱར་ཨེལ�"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
@@ -3173,28 +3159,29 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "དཔེ་གཞི་%s་དེ་མིང་དཔྱད་འབད་མ་ཚུགས�"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "ངོ་རྟགས་གནད་སྡུད་གཞི་རྟེན་བཟོ་བརྩིགས་འབད་དོ�"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 #| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "གཞི་བཙུགས་མ་འབད་བས�"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 #| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "གཞི་བཙུགས་མ་འབད་བས�"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3357,42 +3344,42 @@ msgstr ""
 msgid "_File"
 msgstr "�་བསྡམས�"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "བསྣར་�ེ་ཡོད་པའི་གཞི་བཙུགས་འབད་ནི་དང་རྩ་བས�ྲད་ག�ང་ནི་ཚུ་ཆ་མཉམ་ལག་ལེན་འ�བ�"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "�ུམ་སྒྲིལ་ཚུ་གི་�ོན་རིམ་གསརཔ་ཚུ་གི་དོན་ལུ་ཞིབ་དཔྱད་འབད�"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "ཡར་བས�ྱེད་འབད་བ�ུབ་མི་�ུམ་སྒྲིལ་ཡར་བས�ྱེད་འབད་ནིའི་དོན་ལུ་འཆང་སྟེ་མེད་མི་མི་ཚུ་ཆ་མཉམ་ལུ་རྟགས་བཀལ�"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "�ུམ་སྒྲིལ་ག་དེ་\"new\"ཨིན་ན་སེམས་�ར་ལས་བརྗེད་ད�"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "བསྣར་�ེ་ཡོད་པའི་གཞི་བཙུགས་འབད་ནི་དང་ རྩབས�ྲད་ག�ང་ནི་ འཆང་ནི་དང་ཡར་བས�ྱེད་འབད་ནི་ཚུ་ཆ་མཉམ་ཆ་མེད་"
 "ག�ང་�"
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "ཧེ་མ་ལས་ཕབ་ལེན་འབད་ཡོའ་པའི་�ུམ་སྒྲིལ་ཡིག་སྣོད་ཚུ་བ�ོན་ག�ང་�"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "ད་ལས་ཕར་ཕབ་ལེན་འབད་མ་བ�ུབ་མི་�ུམ་སྒྲིལ་ཡིག་སྣོད་ཚུ་བ�ོན་ག�ང་�"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "�ུམ་སྒྲིལ་འདྲ་མཛོད་དེ་ཡང་བས�ྱར་མངོན་གསལ་འབད�"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3402,7 +3389,7 @@ msgstr ""
 " 'ཨེསི་ཡུ་' དེ་རྩ་བ་ལུ་འགྱུར་ནིའི་དོན་ལུ་གཡོག་བཀོལ� འདི་གིས་ལས་རིམ་དེ་སླར་འགོ་བཙུགསཔ་ཨིན་ དེ་འབད�་"
 "ད་ �ྱོད་ཀྱི་སྒྲིག་སྟངས་དེ་ཉམས་སྲུང་འབད་བཞག་འོང་�"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "ལས་རིམ་དེ་ཕྱིར་འ�ོན་འབད�"
 
@@ -3410,7 +3397,7 @@ msgstr "ལས་རིམ་དེ་ཕྱིར་འ�ོན་འབད�
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "མཇུག་གི་�ུམ་སྒྲིལ་བཀོལ་སྤྱོད་ ཡང་ན་ བཀོལ་སྤྱོད་སྡེ་ཚན་ཚུ་འབད་བཤོལ་བཞག"
 
@@ -3447,7 +3434,7 @@ msgid "_Help"
 msgstr "གྲོགས་རམ�"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3457,19 +3444,19 @@ msgstr ""
 msgid "Update"
 msgstr "དུས་མ�ོན་�ོ་བཀོད་འབད�"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "�ུམ་སྒྲིལ་ཚུ�"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "སྔོན་བལྟ�"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "མོས་མ�ུན་བཟོ་མི�"
 
@@ -3674,7 +3661,7 @@ msgid "Fix Manually"
 msgstr "ལག་དེབ�"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "ཡར་བས�ྱེད�"
 
@@ -4265,11 +4252,11 @@ msgstr "གཞི་བཙུགས་འབད་ཡོདཔ�"
 msgid "Reinstall"
 msgstr "བས�ྱར་བཙུགས�"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "ཡར་བས�ྱེད�"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "རྩ་བས�ྲད�"
 
@@ -4309,7 +4296,7 @@ msgstr "�ུམ་སྒྲིལ་�ོ་ཡིག་དེ་ལུ་ཚ
 msgid "Download already running."
 msgstr "ཕབ་ལེན་འབད་དོ..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "�ུམ་སྒྲིལ་-�ོ་ཡིག་ཅིག་དུས་མ�ུན་བཟོ་ནིི་དང་ ཡང་ན་ གཡོག་བཀོལ་ནི་གཞི་བཙུགས་འབད་ནི་དེ་ཧེ་མ་ལས་རང་ས་"
@@ -4379,29 +4366,29 @@ msgstr "ཆག་ཆག་པའི་�ུམ་སྒྲིལ་ཅིག་
 msgid "Asking whether to replace the configuration file %s"
 msgstr "%sདེ་རིམ་སྒྲིག་གི་ཡིག་སྣོད་གསརཔ་གྱིས་ཚབ་བཙུགས་མ་ཚུགས�"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "�ུམ་སྒྲིལ་ཚུ་ཕབ་ལེན་འབད་དོ�"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "ཆག་ཆག་པའི་�ུམ་སྒྲིལ་ཅིག་ཡང་མེད�"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "ཆག་ཆག་པའི་�ུམ་སྒྲིལ་ཅིག་ཡང་མེད�"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 #| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "རྟེན་འབྲེལ་ཚུ་མོས་མ�ུན་བཟོ�"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 #| msgid "No packages are broken."
 msgid "%d package is broken"
@@ -4409,13 +4396,13 @@ msgid_plural "%d packages are broken."
 msgstr[0] "�ུམ་སྒྲིལ་ག་ཡང་རྒྱུན་ཆད་འབད་དེ་མིན་འདུག"
 msgstr[1] "�ུམ་སྒྲིལ་ག་ཡང་རྒྱུན་ཆད་འབད་དེ་མིན་འདུག"
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 #| msgid "%s changes"
 msgid "View changes"
 msgstr "%s བསྒྱུར་བཅོས�"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 #| msgid "%s changes"
 msgid "Apply changes"
@@ -4424,7 +4411,7 @@ msgstr "%s བསྒྱུར་བཅོས�"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 #| msgid "%d install"
 #| msgid_plural "%d installs"
@@ -4436,7 +4423,7 @@ msgstr[1] "%d གཞི་བཙུགས་འབད་ནི�"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 #| msgid "failed to remove %s"
 msgid "%d package to remove"
@@ -4444,62 +4431,62 @@ msgid_plural "%d packages to remove"
 msgstr[0] "%sདེ་རྩ་བས�ྲད་ག�ང་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ནུག"
 msgstr[1] "%sདེ་རྩ་བས�ྲད་ག�ང་ནི་ལུ་འ�ུས་ཤོར་བྱུང་ནུག"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 #| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "ཕབ་ལེན་གྱི་ཚད�"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 #| msgid "not installed"
 msgid "Not implemented"
 msgstr "གཞི་བཙུགས་མ་འབད་བས�"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 #| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "གཞི་བཙུགས་འབད་ཡོདཔ�"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 #| msgid "^Purge"
 msgid "Purge"
 msgstr "ཕྱིར་བས�ྲད� (^P)"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "བཞག"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "འཆང�"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 #| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "ལག་ལེན་པའི་ལག་དེབ�"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4540,7 +4527,7 @@ msgstr "མེན�"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4591,19 +4578,19 @@ msgstr "%s; དེ་རང་བཞིན་གྱིས་གཞི་་བà½
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 #| msgid "Search"
 msgid "Searching..."
 msgstr "འཚོལ་ཞིབ�"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 #| msgid "Building view"
 msgid "Finalizing view"
 msgstr "མ�ོང་སྣང་བཟོ་རྩིག་འབད་དོ�"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "མ�ོང་སྣང་བཟོ་རྩིག་འབད་དོ�"
@@ -5358,57 +5345,58 @@ msgstr "མ་ཤེས་པའི་ཕྲང་སྒྲིག་གི་ད
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 #| msgid "By-name sorting policies take no arguments"
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "མིང་དབྱེ་སེལ་་འབད་ནི་སྲིད་བྱུས་དེ་གིས་ སྒྲུབ་རྟགས་ཚུ་མི་འབག"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "ནུས་མེད་ཀླད་ཀོར་འབད་མི་རིངཚད་དབྱེ་སེལ་འབད་ནིའི་སྲིད་བྱུའི་མིང་�"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "སྲིད་བྱུས་འགྲལ་བཤད་དབྱེ་སེལ་འབད་ནི་ལུ་ '(' མ�ུན་སྒྲིག་མིན་འདུག"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "ནུས་མེད་དབྱེ་སེལ་འབད་ནིའི་སྲིད་བྱུའི་དབྱེ་བ་'%s'"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "\"%ls\"གི་ཤུལ་ལས་ བཱའིཊི་སྣ་མང་གི་ཡིག་རྒྱུན་ ཌི་ཀོཌི་འབད་མི་ཚུགས�"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr " \"%s\"དེ་གི་ཤུལ་ལས་ རྒྱ་ཅན-ཡིག་འབྲུའི་ཡིག་རྒྱུན་ཌི་ཀོཌི་འབད་མ་ཚུགས�"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s དེ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་བཞག་ནུག�\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "ཕྱོགས་སྒྲིག་པ: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 #, fuzzy
 #| msgid "Compiler: g++ %s\n"
 msgid "Compiled against:\n"
 msgstr "ཕྱོགས་སྒྲིག་པ: g++ %s\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, fuzzy, c-format
 #| msgid "Keep %F at version %s (%s)"
 msgid "  apt version %d.%d.%d\n"
 msgstr "%Fདེ་�ོན་རིམ་%s (%s)གུར་བཞག"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -5418,7 +5406,7 @@ msgstr ""
 "\n"
 "NCurses version: %s\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -5428,56 +5416,56 @@ msgstr ""
 "\n"
 "NCurses version: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, fuzzy, c-format
 #| msgid "libsigc++ version: %s\n"
 msgid "  libsigc++ version: %s\n"
 msgstr "libsigc++�ོན་རིམ་: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 #| msgid "Keep %F at version %s (%s)"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "%Fདེ་�ོན་རིམ་%s (%s)གུར་བཞག"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 #| msgid "Keep %F at version %s (%s)"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "%Fདེ་�ོན་རིམ་%s (%s)གུར་བཞག"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 #| msgid "%s %s compiled at %s %s\n"
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s དེ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་བཞག་ནུག�\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:181
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -5489,7 +5477,7 @@ msgstr ""
 "\n"
 "Curses version: %s\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -5499,13 +5487,13 @@ msgstr ""
 "\n"
 "NCurses version: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, fuzzy, c-format
 #| msgid "libsigc++ version: %s\n"
 msgid "  cwidget version: %s\n"
 msgstr "libsigc++�ོན་རིམ་: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -5515,17 +5503,17 @@ msgstr ""
 "\n"
 "Curses version: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "ལགལེན་: གོམས་འདྲིས་ [-S fname] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "aptitude [གདམ་�་ཚུ་] <བྱ་བ་> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5535,37 +5523,37 @@ msgstr ""
 "འོང་�):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, fuzzy, c-format
 #| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr "གཞི་བཙུགས་འབད�  -�ུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་དང་ ཡར་བས�ྱེད་འབད�\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, fuzzy, c-format
 #| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr "རྩ་བས�ྲད་ག�ང་�  - �ུམ་སྒྲིལ་ཚུ་རྩ་བས�ྲད་ག�ང་�\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, fuzzy, c-format
 #| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr "ཕྱིར་བས�ྲད་ག�ང་�  ་-  �ུམ་སྒྲིལ་ཚུ་དང་དེ་ཚུ་གི་རིམ་སྒྲིག་ཡིག་སྣོད་ཚུ་རྩ་བས�ྲད་ག�ང་�\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, fuzzy, c-format
 #| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr "འཆང་�    - འཆང་ནིའི་གུར་�ུམ་སྒྲིལ་ཚུ་བཞག\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, fuzzy, c-format
 #| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr "འཆང་མི་དགོ   -  �ུམ་སྒྲིལ་ཅིག་གི་དོན་ལུ་ འཆང་ནིའི་བརྡ་བཀོད་ཆ་མེད་ག�ང་�\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, fuzzy, c-format
 #| msgid ""
 #| " markauto     - Mark packages as having been automatically installed\n"
@@ -5573,14 +5561,14 @@ msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 "རང་བཞིན་རྟགས་བཀལ-  �ུམ་སྒྲིལ་ཚུ་རང་བཞིན་གྱིས་�ོག་ལས་གཞི་བཙུགས་འབད་ཡོད་མི་བཟུམ་སྦེ་རྟགས་བཀལ�\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, fuzzy, c-format
 #| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr ""
 "རང་བཞིན་རྟགས་མ་བཀལ-  �ུམ་སྒྲིལ་ཚུ་ རང་བཞིན་གྱིས་�ོག་ལས་རྟགས་བཀལ་ཡོད་མི་བཟུམ་སྦེ་རྟགས་བཀལ�\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5589,19 +5577,19 @@ msgstr ""
 "�ོན་རིམ་བཀག་དམ་འབད-  གོམས་འདྲིས་དེ་ ཡར་བས�ྱེད་འབད་ནི་ལས་གསལ་བཀོད་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་�ོན་རིམ་"
 "ཚུན་ བཀག་དམ་འབད�\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, fuzzy, c-format
 #| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr "དུས་མ�ུན་བཟོ -    གསརཔ་/ཡར་བས�ྱེད་འབད་བ�ུབ་པའི་�ུམ་སྒྲིལ་�ོ་ཡིག་ཅིག་ཕབ་་ལེན་འབད�\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, fuzzy, c-format
 #| msgid " safe-upgrade - Perform a safe upgrade\n"
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr "ཉེན་སྲུང་ཡར་བས�ྱེད་- ཉེན་སྲུང་ལྡན་པའི་ཡར་བས�ྱེད་འབད�\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, fuzzy, c-format
 #| msgid ""
 #| " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5611,60 +5599,60 @@ msgid ""
 "packages.\n"
 msgstr "ཆ་ཚང་-ཡར་བས�ྱེད་-�ུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་དང་རྩ་བས�ྲད་ག�ང་པའི་�ོག་ལས་ ཡར་བས�ྱེད་འབད�\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, fuzzy, c-format
 #| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr "བརྗེད་ནི་ - གསརཔ་ -  �ུམ་སྒྲིལ་ག་ཅི་ཚུ་\"new\" ཨིན་ན་བརྗེད་དགོ\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, fuzzy, c-format
 #| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr "འཛོལ་ཞིབ་འབད་-   �ུམ་སྒྲིལ་ཚུ་གི་དོན་ལུ་མིང་/ཡང་ན་གསལ་བརྗོད་ཀྱིས་འཛོལ་ཞིབ་འབད�\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr "སྟོན་ -  �ུམ་སྒྲིལ་ཅིག་གི་ས�ོར་ལས་རྒྱས་ཤིང་རྒྱསཔ་སྦེ་ཡོད་མི་བརྡ་དོན་ཚུ་བཀྲམ་སྟོན་འབད�\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr "སྟོན་ -  �ུམ་སྒྲིལ་ཅིག་གི་ས�ོར་ལས་རྒྱས་ཤིང་རྒྱསཔ་སྦེ་ཡོད་མི་བརྡ་དོན་ཚུ་བཀྲམ་སྟོན་འབད�\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, fuzzy, c-format
 #| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr "སེལ -  ཕབ་ལེན་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་ཡིག་སྣོད་ཚུ་ཀྲེག་ག�ང་�\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, fuzzy, c-format
 #| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr "རང་བཞིན་གྱིས་སེལ་ནི་ -  ཕབ་ལེན་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་ཡིཡག་སྣོད་་རྙིངམ་ཚུ་ཀྲེག་ག�ང་�\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, fuzzy, c-format
 #| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr "བསྒྱུར་བཅོས་དྲན་དེབ -  �ུམ་སྒྲིལ་གྱི་བསྒྱུར་བཅོས་དྲན་དེབ་ཅིག་སྟོན�\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, fuzzy, c-format
 #| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr "ཕབ་ལེན་འབད-  �ུམ་སྒྲིལ་ཅིག་གི་དོན་ལུ་ཌེབ་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད�\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, fuzzy, c-format
 #| msgid ""
 #| " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5676,7 +5664,7 @@ msgstr ""
 "བས�ྱར་བཙུགས་འབད -  འཕྲལ་�མས་གཞི་བཙུགས་འབད་ཡོད་མི་�ུམ་སྒརིལ་དེ་ཕབ་ལེན་འབད་དེ་སླར་གཞི་བཙུགས་"
 "འབད�\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5684,7 +5672,7 @@ msgid ""
 "                why one or more packages would require the given package.\n"
 msgstr ""
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5693,58 +5681,58 @@ msgid ""
 "                lead to a conflict with the given package if installed.\n"
 msgstr ""
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "གདམ་�་ཚུ་:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr "  -h    འདི་གྲོགས་རམ་ཚིག་ཡིག་ཨིན�\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " --qt           Use the Qt GUI.\n"
 msgstr "  -h    འདི་གྲོགས་རམ་ཚིག་ཡིག་ཨིན�\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr "  -s       བྱ་བ་ཚུ་རྫུས་མ་བཟོ་ དེ་འབད�་ད་ དེ་ཚུ་ངོ་མ་སྦེ་ལག་ལེན་འ�བ�\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr " -d་ �ུམ་སྒྲིལ་ཚུ་ཕབ་ལེན་འབད་ནི་མ་ག�ོགས་ ག་ནི་ཡང་གཞི་བཙུགས་དང་རྩ་བས�ྲད་མ་ག�ང་�\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, fuzzy, c-format
 #| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P      ཨ་རྟག་རང་ ངེས་དཔྱད་འབད་ནི་དང་བྱ་བ་ཚུ་གི་དོན་ལུ་ནུས་སྤེལ་འབད�\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, fuzzy, c-format
 #| msgid ""
 #| " -y             Assume that the answer to simple yes/no questions is "
@@ -5753,7 +5741,7 @@ msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y      བ�ུབ་/མི་བ�ུབ་ཀྱི་དྲི་བའི་ལན་དེ་ 'yes' ཨིན་ཟེར་མནོ་རུང་བ�ུབ�\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, fuzzy, c-format
 #| msgid ""
 #| " -F format      Specify a format for displaying search results; see the "
@@ -5765,7 +5753,7 @@ msgstr ""
 " -F format    འཚོལ་ཞིབ་འབད་ཡོད་པའི་གྲུབ་འབྲས་ཚུ་བཀྲམ་སྟོན་འབད་ནིའི་དོན་ལུ་ རྩ་སྒྲིག་ཅིག་གསལ་བཀོད་"
 "འབད� ལག་དེབ་ལུ་བལྟ�\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, fuzzy, c-format
 #| msgid ""
 #| " -O order       Specify how search results should be sorted; see the "
@@ -5777,7 +5765,7 @@ msgstr ""
 " -O order  འཚོལ་ཞིབ་འབད་ཡོད་པའི་གྲུབ་འབྲས་ཚུ་ག་དེ་སྦེ་གསོག་འཇོག་འབད་ནི་ཨིན་ན་གསལ་བཀོད་འབད� "
 "ལག་དེབ་ལུ་བལྟ�\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, fuzzy, c-format
 #| msgid ""
 #| " -w width       Specify the display width for formatting search results\n"
@@ -5786,29 +5774,29 @@ msgid ""
 msgstr ""
 " -w width འཚོལ་ཞིབ་གྲུབ་འབྲས་རྩ་སྒྲིག་འབད་ནིའི་དོན་ལུ་ བཀྲམ་སྟོན་གྱི་རྒྱ་ཚད་དེ་གསལ་བཀོད་འབད�\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f    �ུམ་སྒྲིལ་ཆག་འགྱོ་ཡོད་མི་ཚུ་ བཙན་ཤུགས་ཅན་གྱི་�ོག་ལས་ཚུད་སྒྲིག་འབད་ནི་ལུ་འབད་རྩོལ་བས�ྱེད�\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr "-V   �ུམ་སྒྲིལ་ཚུ་གི་�ོན་རིམ་ག་འདི་གཞི་བཙུགས་འབད་ནི་ཨིན་ན་སྟོན�\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D  རང་བཞིན་གྱིས་བསྒྱུར་བཅོས་འགྱོ་ཡོད་མི་�ུམ་སྒྲིལ་ཚུ་གི་བརྟེན་འབྲེལ་དེ་སྟོན�\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z   �ུམ་སྒྲིལ་རེ་རེ་བཞིན་གྱི་གཞི་བཙུགས་འབད་ཡོད་པའི་ཚད་ནང་གི་བསྒྱུར་བཅོས་སྟོན�\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, fuzzy, c-format
 #| msgid ""
 #| " -v             Display extra information. (may be supplied multiple "
@@ -5818,7 +5806,7 @@ msgid ""
 "times).\n"
 msgstr " -v  བརྡ་དོན་�ེབས་བཀྲམསྟོན་འབད�(�ེངས་ལེ་ཤ་ཅིག་བཀྲམ་སྤེལ་འབད་འབད�་འོང་�)\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, fuzzy, c-format
 #| msgid ""
 #| " -t [release]   Set the release from which packages should be installed\n"
@@ -5828,7 +5816,7 @@ msgstr ""
 " -t[གསར་བ�ོན་འབད་ནི་] གསར་སྟོན་དེ་ �ུམ་སྒྲིལ་ག་འདི་གཞི་བཙུགས་འབད་དགོཔ་ཨིན་ན་གི་ནང་ལས་ གཞི་སྒྲིག་"
 "འབད�\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, fuzzy, c-format
 #| msgid ""
 #| " -q             In command-line mode, suppress the incremental progress "
@@ -5839,13 +5827,13 @@ msgid ""
 msgstr ""
 "-q   བརྡ་བཀོད་-གྲལ་�ིག་གི་�བས་ལམ་ནང་ལུ་ ཡར་འཕར་ཡར་འཕེལ་གྱི་བརྡ་སྟོན་པ་དེ་མར་མནོན་འབད�\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, fuzzy, c-format
 #| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=val   རིམ་སྒྲིག་གདམ་�འི་མིང་'key'ཟེར་མི་དེ་�ད་ཀར་དུ་གཞི་སྒྲིག་འབད�'\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, fuzzy, c-format
 #| msgid ""
 #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5857,34 +5845,34 @@ msgstr ""
 " --with(out)-recommends\tའོས་སྦྱོར་ཚུ་སྒྲིང་སྒྲིང་ཡོད་པའི་བརྟེན་འབྲེལ་་བཟུམ་སྦེ་\n"
 "              བརྩིའཇོག་འབད་དགོ་དང་མི་དགོ་གསལ་བཀོད་འབད�\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr "-S fname ཨེཕི་མིང་ནང་ལས་ གོམས་འདྲིས་བརྒྱ་བས�ྱེད་འབད་ཡོད་པའི་གནས་ཚད་བརྡ་དོན་དེ་ལྷག�\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u      འགོ་བཙུགས་གུར་ �ུམ་སྒྲིལ་གྱི་�ོ་ཡིག་གསརཔ་ཚུ་ཕབ་ལེན་འབད�\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr ""
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i       འགོ་བཙུགས་གུར་གཞི་བཙུགས་གཡོག་བཀོལ་དེ་ལག་ལེན་འ�བ�\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                 གོམས་འདྲིས་འདི་ལུ་ཡང་དག་པའི་ཀཱའུ་ནུས་ཤུགས་དེ་མེད�.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 #| msgid "replaces"
 msgid "trace"
@@ -5892,13 +5880,13 @@ 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:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 #| msgid "no"
 msgid "info"
@@ -5906,13 +5894,13 @@ 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:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 #| msgid "Err "
 msgid "error"
@@ -5920,103 +5908,82 @@ 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:408
+#: src/main.cc:374
 #, fuzzy
 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:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
 #| msgid "Invalid operation %s"
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "ནུས་མེད་བཀོལ་སྤྱོད་ %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "-q= དེ་གི་ཤུལ་ལས་ཨང་ཡིག་ཅིག་རེ་བ་བས�ྱེད་ཅི�\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "-q=, got %sདེ་གི་ཤུལ་ལས་ཨང་ཡིག་ཅིག་རེ་བ་བས�ྱེད་ཅི�\n"
-
-#: src/main.cc:798
-#, fuzzy, c-format
-#| msgid "-o requires an argument of the form key=value, got %s"
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o དེ་ལུ་རྣམ་པའི་ལྡེ་མིིིག་=གནས་གོང་གི་སྒྲུབ་རྟགས་དེ་དགོས་མ�ོ་ཡོདཔ་ཨིན� %s་ �ོབ་ཅི�"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "WEIRDNESS:མ་ཤེས་པའི་གདམ་�འི་ཨང་རྟགས་�ོབ་ཡོདཔ�\n"
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 #| msgid "Package"
 msgid "first-package"
 msgstr "�ུམ་སྒྲིལ�"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 #| msgid "All Packages"
 msgid "all-packages"
 msgstr "�ུམ་སྒྲིལ་ཆ་མཉམ�"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -6024,42 +5991,36 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 #| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "-uདང་ -i གི་ནང་གཅིག་ར�ྱངམ་ཅིག་གསལ་བཀོད་འབད་འོང་ག་མི་ཤེས�\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 #| msgid ""
 #| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u དང་ -i དེ་བརྡ་བཀོད་-གྲལ་�ིག་�བས་ལམ་ནང་ལུ་གསལ་བཀོད་མི་འབད་འོང་�(དཔེ་འབད་བ་ཅིན་, 'གཞི་"
 "བཙུགས'དང་གཅིག་�ར�)"
 
-#: src/main.cc:1105
-#, fuzzy
-#| msgid "-u and -i may not be specified with a command"
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u དང་ -i དེ་བརྡ་བཀོད་དང་གཅིག་�ར་གསལ་བཀོད་མི་འབད་འོང་�"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "མ་ཤེས་པའི་བརྡ་བཀོད་\"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "མ་ཤེས་པའི་བརྡ་བཀོད་\"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "མ་འཛིན་པའི་དང་ལེན: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, fuzzy, c-format
 #| msgid ""
 #| "Backtrace:\n"
@@ -6080,7 +6041,7 @@ msgstr "དོན་ལུ་འཚོལ་ཞིབ་འབད:"
 msgid "Search backwards for: "
 msgstr "དོན་ལུ་རྒྱབ་ལོག་སྦེ་འཛོལ་ཞིབ་འབད:"
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "ག�ེར་�་འཕྱག་མི�"
 
@@ -6289,7 +6250,7 @@ msgstr "འགས་རྫས་-གྲོགས་རམ་གྱི་ཨིà½
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 19 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "�ུམ་སྒྲིལ�"
 
@@ -6370,8 +6331,8 @@ msgstr "<ཨེན/ཨེ�>"
 msgid "<none>"
 msgstr "<ཅི་མེད�>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "བར་ཅུ་ཡལ�"
@@ -6505,7 +6466,7 @@ msgstr "\"%ls\"དེ་གི་ཤུལ་ལས་ à½�ུམ་སྒྲིà
 msgid "Internal error: Default column string is unparsable"
 msgstr "ནང་འ�ོད་འཛོལ་བ: སྔོན་སྒྲིག་ཀོར་�ིག་ཡིག་རྒྱུན་དེ་མིང་དཔྱད་འབད་མ་བ�ུབ་མི་ཨིན�"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "ལས་ཀ་ཚུ�"
 
@@ -6660,21 +6621,17 @@ msgstr "མ�ུན་སྒྲིག་བརྡ་སྟོན་དེ་༡
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "མ�ུན་སྒྲིག་བརྡ་སྟོན་%lsདེ་གནམ་མེད་ས་མེད་སྦོམ་དྲག་པས� (%s)དེ་འ�ོབ་ཚུགས་པའི་སྡེ་ཚན་ཨིན�"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "ངོ་རྟགས་མེད་མི་�ུམ་སྒྲིལ་ཚུ�"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "ངོ་རྟགས་བརླག་སྟོར་ཞུགས་ཡོདཔ�"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "�ུམ་སྒྲིལ་གྱི་འབྱུང་�ུངས:"
@@ -7312,7 +7269,7 @@ msgstr "འདྲ་མཛོད་ཕབ་ལེན་འབད་དོ�"
 msgid "Really quit Aptitude?"
 msgstr "གོམས་འདྲིས་དེ་�ད་རི་འབའ་རི་སྤང་་ནི་ཨིན་ན?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -7399,7 +7356,7 @@ msgstr ""
 msgid "License"
 msgstr "ཆོག་�མ�(^L)"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 #, fuzzy
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "�ྱོད་ཀྱིས་ལས་རིམ་འདྲ་བཤུས་བར�ྱབ་ཆོག་པའི་ལམ་ལུགས་དེ་སྟོན�"
@@ -7421,7 +7378,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "གྲོགས་རམ�"
 
@@ -7450,7 +7407,7 @@ msgstr "ལག་དེབ�"
 msgid "FAQ"
 msgstr ""
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "འཕྲལ་འཕྲལ་རང་་འདྲི་མི་འདྲི་བ་ཚུ་གི་�ོ་ཡིག་ཅིག་སྟོན�"
 
@@ -7493,15 +7450,15 @@ msgstr ""
 "ག�ང་ནི་ལུ་ཉེན་�་མེདཔ་ཨིན� %n%n �ྱོད་ཀྱིས་སྣོད་�ོ་འདི་དེ་ནང་ལུ་ཡོད་མི་ཚུ་ཆ་མཉམ་རྩ་བས�ྲད་ག�ང་ནི་ཨིན་"
 "ན? �ྱོད་ཀྱིས་\"No\" དེ་སེལ་འ�ུ་འབད་བ་ཅིན་�ྱོད་ཀྱིས་འཕྲིན་དོན་འདི་ལོག་མ�ོང་མི་ཚུགས�"
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "�ུམ་སྒྲིལ་ཕབ་ལེན་གི་ཡར་འཕེལ་དེ་སྟོན�"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "�ུམ་སྒྲིལ་ཕབ་ལེན�"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7512,35 +7469,35 @@ msgstr ""
 "ཚུགས་པའིི་�ུམ་སྒྲིལ་ཚུ་གིས་%B �ྱོད་ཀྱི་རིམ་ལུགས་ཀྱི་སྲུང་ས�ྱོབ་%bདེ་ ནང་འགྲིགས་འབད་དགོ �ྱོད་ཀྱིས་འ་ནི་འདི་"
 "�ྱོདཀྱིས་འབད་ནི་ཨིནམ་ངེས་ཅན་སྦེ་ཤེས་པ་ཅིན་ར�ྱངམ་ཅིག་ གཞི་བཙུགས་འབད་ནིི་དེ་འཕྲོ་མ�ུད་དགོ%n%n "
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "%S*%N %s [�ོན་རིམ་ %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "�ད་རི་འབའ་རི་འཕྲོ་མ�ུད་འབད�"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "གཞི་བཙུགས་འབད་ནི་བར་བཤོལ�"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "�ུམ་སྒྲིལ་གཞི་བཙུགས་ཀྱི་སྔོན་བལྟ�"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "སྟོན་ཡང་ན་ལས་འགན་འགྲུབ་ནི་ཨིན་མའི་དོན་ལུ་བྱ་བ་ཚུ་བདེ་སྒྲིག་འབད� "
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "�ུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཆག་སོངམ་ལས་ག�ན་པར་བཟོོ་ནུག:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "རྟེན་འབྲེལ་འདི་ལུ་�བས་ཤེས་མེད་ཟེར་བཟི་དཀའ་ངལ་བྱུང་མ་ཨིན!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7549,7 +7506,7 @@ msgstr ""
 "རྟེན་འབྲེལ་ཚུ་མོས་མ�ུན་འབད་ནི་ལུ་འབད་རྩོལ་བས�ྱེད་པའི་ས�བས་ལུ་དུས་ཚོད་ཀྱི་བདའ་མ་ཟུན�(ཧེང་བཀལ་འབད་རྩོལ་"
 "བས�ྱེད་ནིའི་དོན་ལུ་ \"%s\" དེ་ལུ་ཨེབ�)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7557,21 +7514,21 @@ msgstr ""
 "�ུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས་/རྩ་བས�ྲད་ག�ང་ནི་ལུ་ �ྱོད་ལུ་ད་ལྟོ་མེད་པའི་བདག་ས�ྱོང་དང་འབྲེལ་བའི་�ེ་དབང་དགོས་མ�ོ་"
 "ཡོདཔཨིན� �ྱོད་ཀྱིས་རྩ་བའི་རྩིས་�ོ་ལུ་བསྒྱུར་བཅོས་འབད་ནི་ཨིན་ན?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "རྩ་བ་ལུ་འགྱུར�"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "རྩ་བ་ལུ་འགྱུར་མི་དགོ"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "�ུམ་སྒྲིལ་ཚུ་ཅིག་ཡང་གཞི་བཙུགས་འབད་ནི་དང་ རྩ་བས�ྲད་ག�ང་ནི་ ཡང་ན་ ཡར་བས�ྱེད་འབད་ནི་ལུ་འཆར་རིམ་མ་"
 "བཟོ་བས�"
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7581,19 +7538,19 @@ msgstr ""
 "ཚུགསཔ་འོང་དེ་འབད�་ད་ �ྱོད་ཀྱིས་དེ་ཚུ་ཡར་བས�ཡེད་འབད་ནི་ལུ་གདམ་ག་མ་བར�ྱབ་པས� ཡར་བས�ྱེད་གུར་གྲ་སྒྲིག་"
 "འབད་ནིའ་དོན་ལུ་ \"U\" དེ་ཡིག་དཔར་ར�ྱབས�"
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "�ུམ་སྒྲིལ་གྱི་�ོ་ཡིག་ཚུ་དུས་མ�ུན་བཟོ་དོ�"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "�ུམ་སྒྲིལ་�ོ་ཡིག་གི་དུས་མ�ུན་བཟོ་ནིའི་ཡར་འཕེལ་དེ་སྟོན�"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "དུས་མ�ོན་�ོ་བཀོད་འབད�"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7601,23 +7558,23 @@ msgstr ""
 "�ུམ་སྒྲིལ་�ོ་ཡིག་ཚུ་དུས་མ�ུན་བཟོ་ནི་ལུ་ �ྱོད་ལུ་ད་ལྟོ་མེད་པའི་བདག་ས�ྱོང་དང་འབྲེལ་བའི་�ེ་དབང་ཚུ་དགོས་མ�ོ་"
 "ཡོདཔ་ཨིན� �ྱོད་ཀྱིས་རྩ་བའི་རྩིས་�ོ་བསྒྱུར་བཅོས་འབད་ནི་ཨིན་ན?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "འགས་རྫས་ཚུ་འཚོལ་ནིའི་འབད་རྩོལ་བས�ྱེད་དགོ་པ་ཅིན་དུས་་ཚོད་འབྱིན་དགོཔ་ཨིན�"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "ཕབ་ལེན་ཡར་འཕེལ་འབད་བའི་སྒང་ཡོད་མི་དེ་མ་ཆོགཔ་ད་ལུ་གཙང་དག་བཟོ་དོ�"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "ཕབ་ལེན་འབད་ཡོད་པའི་ཡིག་སྣོད་ཚུ་བ�ོན་ག�ང་དོ�"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "ཕབ་ལེན་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་ཡིག་སྣོད་ཚུ་བ�ོན་ག�ང་ནུག"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7629,11 +7586,11 @@ msgstr ""
 "�ུམ་སྒྲིལ་�ོ་ཡིག་ཚུ་དུས་མ�ུན་བཟོ་ནི་ལུ་ �ྱོད་ལུ་ད་ལྟོ་མེད་པའི་བདག་ས�ྱོང་དང་འབྲེལ་བའི་�ེ་དབང་ཚུ་དགོས་མ�ོ་"
 "ཡོདཔ་ཨིན� �ྱོད་ཀྱིས་རྩ་བའི་རྩིས་�ོ་བསྒྱུར་བཅོས་འབད་ནི་ཨིན་ན?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "ཨེཔཊི་འདྲ་མཛོད་ཀྱི་ཡིག་སྣོད་དེ་འ�ོབ་མི་ཚུགས� རང་བཞིན་གྱིས་གཙང་དག་བཟོ་མི་ཚུགས�"
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7642,7 +7599,7 @@ msgstr ""
 "ཕན་མེད་ཀྱི་ཕབ་ལེན་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་ཡིག་སྣོད་ཚུ་བ�ོན་ག�ང་ནུག ཌིཀསི་བར་སྟོང་གི་ %sB དེ་རང་དབང་"
 "ཅན་བཟོ་དོ�"
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7654,124 +7611,124 @@ msgstr ""
 "�ུམ་སྒྲིལ་�ོ་ཡིག་ཚུ་དུས་མ�ུན་བཟོ་ནི་ལུ་ �ྱོད་ལུ་ད་ལྟོ་མེད་པའི་བདག་ས�ྱོང་དང་འབྲེལ་བའི་�ེ་དབང་ཚུ་དགོས་མ�ོ་"
 "ཡོདཔ་ཨིན� �ྱོད་ཀྱིས་རྩ་བའི་རྩིས་�ོ་བསྒྱུར་བཅོས་འབད་ནི་ཨིན་ན?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "�བས་ཤེས་དེ་ལས་ལྷག་སྟེ་མེད�"
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "འཇུག་སྤྱོད་འབད་ནིའི་དོན་ལུ་�བས་ཤེས་ཅིག་འཚོལ་མ་འ�ོབ�"
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "�བས་ཤེས་ཅིག་འཚོལ་བའི་ས�བས་ལུ་དུས་ཚོད་ཀྱི་བདའ་མ་ཟུན�"
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "རྟེན་འབྲེལ་ཚུ་མོས་མ�ུན་བཟོ�"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "ངལ་རངས་མ་འབྱུང་པའི་རྟེན་འབྲེལ་ཚུ་གི་དོན་ལུ་ �བས་ཤེས་ཚུ་འཚོལ་ཞིབ་འབད�"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "%ls དེ་�་ཕྱེ་མི་ཚུགས་པས�"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "མོས་མ�ུན་བཟོ་མི་གནས་ལུགས་དེ་བཀོག་བཞག་པའི་ས�བས་ལུ་འཛོལ་བ་བྱུང་ནུག"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "�ུམ་སྒྲིལ་ཚུ་གཞི་བཙུགས/རྩ་བས�ྲད་ག�ང་�(^I)"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "�ུམ་སྒྲིལ་གྱི་�ོ་ཡིག་དེ་དུས་མ�ུན་བཟོ�(^U)"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "ཡར་བས�ྱེད་འབད་བ�ུབ་མི་ལུ་རྟགས་བཀལ�(^g)"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "�ུམ་སྒྲིལ་གསརཔ་ཚུ་སེམས་�ར་ལས་བརྗེད་ད�(^F)"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "བསྣར་�ེ་ཡོད་པའི་བྱ་བ་ཚུ་ཆ་མེད་ག�ང་�(^e)"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "�ུམ་སྒྲིལ་འདྲ་མཛོད་དེ་གཙང་དག་བཟོ� (^C)"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "ཕན་ཡིག་སྣོད་ཚུ་གཙང་དག་བཟོ� (^o)"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "�ུམ་སྒྲིལ་འདྲ་མཛོད་དེ་ཡང་བས�ྱར་མངོན་གསལ་འབད�(^R)"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "འགས་རྫས་འཕྱག་མི་ག�ང་� (^P)"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "རྩ་བ་ལུ་འགྱུར་འོང་� (^B)"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "སྤང་�(^Q)"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "འབད་བཤོལ�"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "གཞི་བཙུགས�(^I)"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "གཞི་བཙུགས་དང་ཡར་བས�ྱེད་འབད་ནིའི་དོན་ལུ་ ད་ལྟོ་སེལ་འ�ུ་འབད་ཡོའ་པའི་�ུམ་སྒྲིལ་དེ་ལུ་ཟུར་རྟགས་བཀོད�"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "རྩ་བས�ྲད� (^R)"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "རྩ་བས�ྲད་ག�ང་ནིའི་དོན་ལུ་ ད་ལྟོ་སེལ་འ�ུ་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་དེ་ལུ་ཟུར་རྟགས་བཀོད�"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "ཕྱིར་བས�ྲད� (^P)"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "རྩ་བས�ྲད་ག�ང་ནིའི་དོན་ལུ་ད་ལྟོ་སེལ་འ�ུ་འབད་ཡོད་མི་�ུམ་སྒྲིལ་དང་ དེའི་རིམ་སྒྲིག་ཡིག་སྣོད་དེ་ལུ་ ཟུར་རྟགས་"
 "བཀོད�"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "བཞག(^K)"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "བྱ་བ་ག་འབད་རུང་ཅིག་སེལ་འ�ུ་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་གུར་ཆ་མེད་ག�ང་�"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "འཆང� (^H)"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7779,11 +7736,11 @@ msgstr ""
 "བྱ་བ་ག་འབད་རུང་ཅིག་སེལ་འ�ུ་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་གུར་ཆ་མེད་ག�ང་ཞིནམ་ལས་ འ་ནི་དེ་མ་འོངས་པ་ལུ་ཡར་"
 "བས�ྱེད་འབད་ནི་ལས་ཉེན་ས�ྱོབ་འབད�"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "རང་བཞིན་ལུ་རྟགས་བཀལ� (^A)"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7791,11 +7748,11 @@ msgstr ""
 "སེལ་འ�ུ་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ་རང་བཞིན་གྱིས་�ོག་ལས་གཞི་བཙུགས་འབད་ཡོདཔ་བཟུམ་སྦེ་རྟགས་བཀལ� �ུམ་སྒྲིལ་"
 "གཞན་མི་ཚུ་གིས་དེ་ལུ་མ་བརྟེན་པ་ཅིན་ འ་ནི་དེ་རང་བཞིན་གྱིས་རྩ་བས�ྲད་ག�ང་འོང་�"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "ལག་དེབ་ལུ་རྟགས་བཀལ�(^M)"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7803,11 +7760,11 @@ msgstr ""
 "སེལ་འ�ུ་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ་ལག་�ོག་ལས་གཞི་བཙུགས་འབད་དེ་ཡོད་དོ་བཟུམ་སྦེ་རྟགས་བཀལ� �ྱོད་ཀྱིས་ལག་"
 "�ོག་ལས་རྩ་བས�ྲད་མ་ག�ང་ཚུན་ཚོད་ དེ་གིས་རྩ་བས�ྲད་མི་འགྱོ�"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "�ོན་རིམ་མ་ཆོགཔ་བཟོ�(^F)"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7815,335 +7772,335 @@ msgstr ""
 "སེལ་འ�ུ་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་ཚུ་གིས་མི་ངོའི་�ོན་རིམ་དེ་གཞི་བཙུགས་འབད་ནི་ལས་མ་ཆོགཔ་བཟོ� �ུམ་སྒྲིལ་དེ་གི་"
 "�ོན་རིམ་གསརཔ་ཚུ་ཨ་རྟག་བཟུམ་སྦེ་གཞི་བཙུགས་འབད་ནི་ཨིན�"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "བརྡ་དོན�(^n)"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "སེལ་འ�ུ་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་དེ་གི་ས�ོར་ལས་བརྡ་དོན་ཧེང་བཀལ་བཀྲམ་སྟོན་འབད�"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "བསྒྱུར་བཅོས་དྲན་དེབ� (^C)"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "སེལ་འ�ུ་འབད་ཡོད་པའི་�ུམ་སྒྲིལ་དེ་གི་ཌེ་བི་ཡཱན་བསྒྱུར་བཅོས་དྲན་དེབ་བཀྲམ་སྟོན་འབད�"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "�བས་ཤེས་བརྟག་དཔྱད་འབད�"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "ད་ལྟོ་སེལ་འ�ུ་འབད་ཡོད་པའི་�བས་ཤེས་དེ་རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་དེ་ལུ་བརྟག་དཔྱད་འབད�"
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "�བས་ཤེས་འཇུག་སྤྱོད་འབད�"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "ད་ལྟོ་སེལ་འ�ུ་འབད་ཡོད་པའི་�བས་ཤེས་ཚུ་ནང་ལུ་ཡོད་པའི་བྱ་བ་ཚུ་ལག་ལེན་འ�བ�"
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "ཤུལ་མམ་གྱི་�བས་ལམ� (^N)"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "ཤུལ་མམ་གྱི་�བས་ཤེས་དེ་རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་དེ་ལུ་སེལ་འ�ུ་འབད�"
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "ཧེ་མམ་གྱི་་�བས་ཤེས� (^P)"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "ཧེ་མམ་གྱི་�བས་ཤེས་དེ་རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་དེ་ལུ་སེལ་འ�ུ་འབད�"
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "�བས་དང་པ� (^F)"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "�བས་ཤེས་དང་པམ་དེ་རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་དེ་ལུ་སེལ་འ�ུ་འབད�"
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "མཇུག་གི་�བས་ཤེས�"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr ""
 "མཇུག་གི་སེལ་འ�ུ་དེ་ད་ལྟོ་ཚུན་ཚོད་བཟོ་བ�ོན་འབད་ཡོད་པའི་རྟེན་འབྲེལ་གྱི་དཀའ་ངལ་དེ་ལུ་སེལ་འ�ུ་འབད�"
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "སོར་སྟོན་སྣང་མེད་སྦེ་བཞག་ཡོདཔ�(^R)"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "ད་ལྟོ་སེལ་འ�ུ་འབ�་ཡོད་པའི་བྱ་བ་དེ་སྣང་མེད་སྦེ་བཞག་སྟེ་ཡོད་དང་མེད་སོར་སྟོན་འབད�"
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "སོར་སྟོན་གནང་བ་གྲོལ་ཡོདཔ� (^A)"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "ད་ལྟོ་སེལ་འ�ུ་འབད་ཡོད་པའི་བྱ་བ་དེ་གི་གནང་བ་གྲོལ་ཡོད་དང་མེད་སོར་སྟོན་འབད�"
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "དམིགས་ག�ད་སྟོན� (^V)"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "�ུམ་སྒྲིལ་ག་དེ་ལུ་སེལ་འ�ུ་འབད་ཡོད་པའི་བྱ་བ་གིས་གནོད་ས�ྱོན་འབྱུང་ནི་ཨིན་པས་ག་སྟོན�"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "འཚོལ�(^F)"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "གདོང་བས�ྱོད་འབད་དེ་འཚོལ་ཞིབ་འབད�"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "རྒྱབ་བས�ྱོད་དེ་འཚོལ� (^F)"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "རྒྱབ་བས�ྱོད་འབད་དེ་ཚའོལ་ཞིབ་འབད�"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "ལོག་སྟེ་འཚོལ�(^A)"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "མཇུག་གི་འཚོལ་ཞིབ་འབད་ཡོད་མི་དེ་ཡང་བས�ྱར་འབད�"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "རྒྱབ་བས�ྱོད་དེ་ལོག་འཚོལ� (^B)"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "མཇུག་གི་འཚོལ་ཞིབ་འབད་ཡོད་མི་དེ་རྒྱབ་འགལ་ཕྱོགས་སུ་་ཡང་བས�ྱར་འབད�"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "བཀྲམ་སྟོན་འབད་ནི་ལུ་་ཚད་བཀལ�(^L)"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "�ུམ་སྒྲིལ་�ོ་ཡིག་དེ་ལུ་ཚགས་མ་ཅིག་འཇུག་སྤྱོད་འབད�"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "བཀྲམ་སྟོན་འབད་ནི་ལུ་ཚད་བཤོལ་འབད�"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "�ུམ་སྒྲིལ་གྱི་�ོ་ཡིག་དེ་ནང་ལས་ཚགས་མ་དེ་སྟོན་ག�ང་�"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "ཆག་ཆགཔ་འཚོལ�(^B)"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "ཤུལ་མམ་གྱི་�ུམ་སྒྲིལ་དེ་ངལ་མ་འབྱུང་མི་རྟེན་འབྲེལ་ཚུ་དང་གཅིག་�ར་འཚོལ�"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 #, fuzzy
 msgid "^Preferences"
 msgstr "སྔོན་བརྟེན�"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "ཡུ་ཨའི་གི་གདམ་��(^M)"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "ལག་ལེན་པའི་ངོས་འདྲ་བ་དེ་ལུ་གནོད་ས�ྱོན་འབྱུང་བཅུག་མི་སྒྲིག་སྟངས་དེ་བསྒྱུར་བཅོས་འབད�"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "རྟེན་འབྲེལ་ལེགས་ས�ྱོང་འ�བ་ནི�(^D)"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "�ུམ་སྒྲིལ་གྱི་རྟེན་འབྲེལ་ག་དེ་སྦེེ་ལེགས་ས�ྱོང་འ�བ་ཨིན་ན་ལུ་གོནད་ས�ྱོན་འབྱུང་བཅུག་མི་སྒྲིག་སྟངས་དེ་བསྒྱུར་བཅོས་འབད�"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "སྣ་ཚོགས�(^M)"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "ལས་རིམ་སྣ་ཚོགས་ཀྱི་སྒྲིག་སྟངས་དེ་བསྒྱུར་བཅོས་འབད�"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "གདམ་�་ཚུ་རྒྱབ་ལོག་འབད�(^R)"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "སྒྲིག་སྟངས་ཚུ་ཆ་མཉམ་རང་རིམ་ལུགས་སྔོན་སྒྲིག་དེ་ལུ་སླར་སྒྲིག་འབད�"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "ཤུལ་མམ�(^N)"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "ཤུལ་མམ་གྱི་བཀྲམ་སྟོན་དེ་སྟོན�"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "ཧེ་མམ�(^P)"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "ཧེ་མམ་གྱི་བཀྲམ་སྟོན་དེ་སྟོན�"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "�་བསྡམས�(^C)"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "བཀྲམ་སྟོན་འདི་�་བསྡམས�"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "�ུམ་སྒྲིལ་གསརཔ་སྟོན�(^V)"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "སྔོན་སྒྲིག་�ུམ་སྒྲིལ་གྱི་མ�ོང་སྣང་ཅིག་གསར་བས�ྲུན་འབད�"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "རྩིས་ཞིབ་འོས་སྦྱོར�(^R)"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr "�ྱོད་ཀྱིས་གཞི་བཙུགས་འབད་མི་འོས་སྦྱོར་འབད་ཡོད་མི་�ུམ་སྒྲིལ་ད་ལྟོ་གཞི་བཙུགས་འབད་དེ་མེད་མི་ཚུ་སྟོན�"
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "�ུམ་སྒྲིལ་ལེབ་�ེམ་ཡོད་མི་�ོ་ཡིག་གསརཔ�(^F)"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "�ུམ་སྒྲིལ་ཚུ་ཆ་མཉམ་རིམ་ལུགས་གུར་དབྱེ་རིམ་བཟོ་སྟེ་མེད་མི་�ོ་ཡིག་ར�ྱང་པའི་ནང་སྦེ་སྟོན�"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "ཌེབ་ཊེགསི་་བརའུ་ཟར་གསརཔ�(^D)"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "ཌེབ་ཊེགསི་གནད་སྡུད་དེ་ལག་ལེན་འ�བ་པའི་�ོག་ལས་�ུམ་སྒྲིལ་ཚུ་བརྡ་འཚོལ་འབད�"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "དབྱ་རིམ་གསརཔ་གི་བརའུ་ཟར�(^B)"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "�ུམ་སྒྲིལ་ཚུ་དབྱེ་རིམ་གིས་སྦེ་བརྡ་འཚོལ་འབད�"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "ས�ོར་ལས�(^A)"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "ལས་རིམ་འདི་གི་ས�ོར་ལས་བརྡ་དོན་སྟོན�"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "གྲོགས་རམ�(^H)"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "གློག་�ོག་གྲོགས་རམ་དེ་སྟོན�"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "ལག་ལེན་པའི་ལག་དེབ�(^M)"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "རྒྱས་བཤད་ལས་རིམ་གྱི་ལག་དེབ་དེ་སྟོན�"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "ཨེཕ་ཨེ་ཀེཡུ�(^F)"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "གནས་ཚུལ�(^N)"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "གི་�ོན་རིམ་རེ་རེའི་ནང་ལུ་བཟོ་ཡོད་མི་གལ་གནད་ཅན་གྱི་བསྒྱུར་བཅོས་དེ་ཚུ་སྟོན�"
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "ཆོག་�མ�(^L)"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "བྱ་བ་ཚུ་སྟོན�"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "འཚོལ་ཞིབ�"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "གདམ་�་ཚུ�"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "མ�ོང་སྣང་�"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8152,11 +8109,11 @@ msgstr ""
 "%ls: དཀར་ཆག  %ls: གྲོགས་རམ་  %ls: སྤང་  %ls: དུས་མ�ུན་བཟོ་  %ls: �ུམ་སྒྲིལ་ཚུ་ ཕབ་ལེན་/"
 "གཞི་བཙུགས་/རྩ་བས�ྲད་ག�ང�"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "ལྡེ་མིག་ཡོད�(_K)"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "ལྡེ་མིག་མེད�(_k)"
 
@@ -8187,9 +8144,43 @@ msgstr "བསྒྱུར་བཅོས་ལོགསི་ ཚུ་ཕབà¼
 msgid "Downloading the changelog of %s"
 msgstr "བསྒྱུར་བཅོས་དྲེན་དེབ་ཕབ་ལེན་འབད་དོ�"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "�ྱོད་ཀྱིས་གཞུང་འབྲེལ་གྱི་ཌེ་བི་ཡཱན་�ུམ་སྒྲིལ་ཚུ་གི་བསྒྱུར་བཅོས་དྲན་དེབ་ར�ྱངམ་ཅིག་སྟོན་ཚུགས�"
+#~ msgid "MISSING TAG"
+#~ msgstr "ངོ་རྟགས་བརླག་སྟོར་ཞུགས་ཡོདཔ�"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "བསྒྱུར་བཅོས་ལོགསི་ ཚུ་ཕབ་ལེན་འབད་ནིའི་དོན་ལུ་ལག་ལེན་འ�བ་་ནི་གི་ཡུ་ཨཱར་ཨེལ�"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s དེ་གཞུང་འབྲེལ་གྱི་ཌེ་བི་ཡཱན་�ུམ་སྒྲིལ་ཅིག་མེནམ་ལས་ དེ་གི་བསྒྱུར་བཅོས་དྲན་དེབ་བཀྲམ་སྟོན་འབད་མི་ཚུགས�"
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "\"%s\"ཟེར་མིང་བ�གས་ཡོད་མི་�ུམ་སྒྲིལ་དེ་�ོབ་མ་ཚུགས�"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "དཔེ་གཞི་%s་དེ་མིང་དཔྱད་འབད་མ་ཚུགས�"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "-q= དེ་གི་ཤུལ་ལས་ཨང་ཡིག་ཅིག་རེ་བ་བས�ྱེད་ཅི�\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "-q=, got %sདེ་གི་ཤུལ་ལས་ཨང་ཡིག་ཅིག་རེ་བ་བས�ྱེད་ཅི�\n"
+
+#, fuzzy
+#~| msgid "-o requires an argument of the form key=value, got %s"
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o དེ་ལུ་རྣམ་པའི་ལྡེ་མིིིག་=གནས་གོང་གི་སྒྲུབ་རྟགས་དེ་དགོས་མ�ོ་ཡོདཔ་ཨིན� %s་ �ོབ་ཅི�"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "WEIRDNESS:མ་ཤེས་པའི་གདམ་�འི་ཨང་རྟགས་�ོབ་ཡོདཔ�\n"
+
+#, fuzzy
+#~| msgid "-u and -i may not be specified with a command"
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u དང་ -i དེ་བརྡ་བཀོད་དང་གཅིག་�ར་གསལ་བཀོད་མི་འབད་འོང་�"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "�ྱོད་ཀྱིས་གཞུང་འབྲེལ་གྱི་ཌེ་བི་ཡཱན་�ུམ་སྒྲིལ་ཚུ་གི་བསྒྱུར་བཅོས་དྲན་དེབ་ར�ྱངམ་ཅིག་སྟོན་ཚུགས�"
 
 #~ msgid "Err "
 #~ msgstr "ཨི་ཨཱར་ཨཱར�"
@@ -8324,11 +8315,6 @@ msgstr "�ྱོད་ཀྱིས་གཞུང་འབྲེལ་གྱི
 #~ msgstr "བསྒྱུར་བཅོས་དྲེན་དེབ་ཕབ་ལེན་འབད་དོ�"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "ཧུམ་ཆ་མ་འ�ོབ�"
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "�ུམ་སྒྲིལ་སྡེ་རིམ་གྱི་ཡིག་སྣོད་%sདེ་�་ཕྱེ་མ་ཚུགས�"
diff --git a/po/el.gmo b/po/el.gmo
index a5558b80..80eeef04 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index f0af4a64..22099fa4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:23+0800\n"
 "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -381,24 +381,10 @@ msgstr ""
 "sources.list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "Διε�θυνση που θα χ�ησιμοποιηθεί για τη μεταφό�τωση των α�χείων αλλαγών"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Η επιλογή αυτή ελέγχει το υπόδειγμα που χ�ησιμοποιείται για το κατέβασμα "
-"α�χείων αλλαγών (changelogs) από τον δικτυακό τόπο του Debian. Θα χ�ειαστεί "
-"να το αλλάξετε μόνο αν τα α�χεία αλλαγών μετακινηθο�ν σε κάποιο άλλο URL."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Π�οεπισκόπηση των ε�γασιών π�ιν την διεκπε�αίωσή τους"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -407,12 +393,12 @@ msgstr ""
 "εκτελέσει μια ε�γασία εγκατάστασης. θα εμφανίσει π�ώτα μια σ�νοψη των "
 "ενε�γειών που π�όκειται να εκτελέσει."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "�α αγνοο�νται τα \"νέα\" πακέτα όταν ανανεώνονται οι λίστες πακέτων"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -420,13 +406,13 @@ msgstr ""
 "Αν η επιλογή αυτή είναι ενε�γή, το aptitude θα καθα�ίσει τη λίστα των νέων "
 "πακέτων αφο� έχετε ενημε�ώσει τη λίστα πακέτων (πχ. πατώντας το 'u')."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "�α αγνοο�νται τα \"νέα\" πακέτα όταν εγκαθίστανται ή αφαι�ο�νται πακέτα"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -436,14 +422,14 @@ msgstr ""
 "πακέτων αφο� έχετε εκτελέσει μια ε�γασία εγκατάστασης ή αφου έχετε "
 "εγκαταστήσει ή αφαι�έσει πακέτα από την γ�αμμή εντολών."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "Μη εμφάνιση π�οειδοποίησης όταν η π�ώτη αλλαγή γίνεται σε κατάσταση μόνο-"
 "ανάγνωσης"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -453,13 +439,13 @@ msgstr ""
 "π�οειδοποίηση όποτε μεταβάλλετε την κατάσταση ενός πακέτου και δεν έχετε τα "
 "π�ονόμια για να εφα�μόσετε την αλλαγή αυτή στο σ�στημα."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "�α υπά�χει ειδοποίηση για κάθε απόπει�α εκτέλεσης π�ονομιακής εντολής ως "
 "απλός χ�ήστης"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -472,11 +458,11 @@ msgstr ""
 "τον root. Θα σας δωθεί η δυνατότητα να μπείτε στο σ�στημα σαν root και να "
 "εκτελέσετε την ενέ�γεια αυτή με τα π�ονόμια του χ�ήστη root."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Α�χείο καταγ�αφής των ε�γασίων"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -488,11 +474,11 @@ msgstr ""
 "α�χείου είναι ο χα�ακτή�ας '%B|%b', το υπόλοιπο του ονόματος θα ε�μηνευθεί "
 "σαν μια εντολή κελ�φους που θα λάβει την καταγ�αφή από την συνήθη είσοδο."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Αυτόματη ανάλυση εξα�τήσεων ενός πακέτου όταν αυτό επιλέγεται"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -502,12 +488,12 @@ msgstr ""
 "Αν αυτή η επιλογή είναι ενε�γοποιημένη, το aptitude θα χ�ησιμοποιήσει μια "
 "απλή ευ�ιστική μέθοδο "
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Αυτόματη διό�θωση ελαττωματικών πακέτων π�ιν την εγκατάσταση ή αφαί�εση"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -519,11 +505,11 @@ msgstr ""
 "τ�έχουσα υπόδειξη από τον επιλυτή π�οβλημάτων. Διαφο�ετικά, το aptitude θα "
 "σας π�οτ�έψει για μια επίλ�ση των π�οβληματικών εξα�τήσεων."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Αυτόματη εγκατάσταση συνιστώμενων πακέτων"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -541,11 +527,11 @@ msgstr ""
 "αφαί�εση μη χ�ησιμοποιημένων πακέτων\", πακέτα που συστήνονται από ένα "
 "εγκατεστημένο πακέτο δεν θα αφαι�εθο�ν αυτόματα."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Αυτόματη αφαί�εση αχ�ησιμοποιήτων πακέτων"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -563,11 +549,11 @@ msgstr ""
 "π�οτεινόμενων πακέτων\", αυτόματα εγκατεστημένα πακέτα δεν θα αφαι�εθο�ν αν "
 "π�οτείνονται από οποιοδήποτε εγκατεστημένο πακέτο."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Πακέτα που δεν θα έπ�επε ποτέ να αφαι�εθο�ν αυτόματα."
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -577,12 +563,12 @@ msgstr ""
 "σαν κάποιο πακέτο να εξα�τάται από αυτά: δεν θα γίνουν ποτέ στόχος για "
 "αφαί�εση σαν μη χ�ησιμοποιημένα πακέτα."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Επίτ�εψε τις επιλ�σεις εξα�τήσεων που πα�αβιάζουν τα πεδία holds ή forbids."
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -605,15 +591,15 @@ msgstr ""
 "πακέτου που μόλις επιλέχθηκε για εγκατάσταση ή αναβάθμιση, σαν αποτέλεσμα "
 "του σφάλματος #470035 στο apt."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Επιλογές Διεπαφής Χ�ήστη"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Διαχεί�ιση εξα�τήσεων"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Διάφο�α"
 
@@ -717,7 +703,7 @@ msgstr "Αδ�νατη η ε��εση πηγαίου πακέτου για το
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Αδ�νατη η ικανοποίηση του build-depends: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -726,7 +712,7 @@ msgstr ""
 "Σημείωση: \"%s\", πα�έχει το εικονικό πακέτο\n"
 "      \"%s\", είναι ήδη εγκατεστημένο.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -735,7 +721,7 @@ msgstr ""
 "Σημείωση: \"%s\", πα�έχει το εικονικό πακέτο\n"
 "      \"%s\", είναι ήδη επιλεγμένο για εγκατάσταση.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -744,17 +730,24 @@ msgstr ""
 "το \"%s\" υπά�χει στη βάση, αλλά δεν είναι π�αγματικό\n"
 "πακέτο και ο�τε πα�έχεται από άλλο πακέτο.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" είναι ένα εικονικό πακέτο που πα�έχεται από το:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Θα π�έπει να επιλέξετε ένα για εγκατάσταση.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr ""
+"Το πακέτο %s δεν είναι εγκατεστημένο, δεν μπο�εί να απαγο�ευτεί αναβάθμιση\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -763,68 +756,60 @@ msgstr ""
 "Σημείωση: επιλέχθηκε το \"%s\" στη θέση του\n"
 "      εικονικο� πακέτου \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "το %s είναι ήδη εγκατεστημένο και στην αιτο�μενη έκδοση (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 #| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "το %s δεν είναι εγκατεστημένο, ά�α δεν θα επανεγκατασταθεί.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 #| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "το %s είναι ήδη εγκατεστημένο και στην αιτο�μενη έκδοση (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "το %s δεν είναι εγκατεστημένο, ά�α δεν θα επανεγκατασταθεί.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Το πακέτο %s δεν είναι εγκατεστημένο, ά�α δεν θα αφαι�εθεί\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "Το πακέτο %s δεν είναι εγκατεστημένο, δεν μπο�εί να απαγο�ευτεί αναβάθμιση\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Το πακέτο %s δεν είναι αναβαθμίσιμο, δεν μπο�εί να απαγο�ευτεί αναβάθμιση\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Σημείωση: επιλέχθηκε ο σκοπός \"%s: %s\" για εγκατάσταση\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Μπο�είτε να π�οσδιο�ίσετε την έκδοση ενός πακέτου μόνο με μια εντολή "
-"'install' ή μια εντολή 'forbid-version'.\n"
+"'install' ή μια εντολή 'forbid-version'"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
 msgstr ""
-"Δεν μπο�είτε να καθο�ίσετε όνομα α�χείου πακέτου με την εντολή "
-"εγκατάστασης.\n"
+"Δεν μπο�είτε να καθο�ίσετε όνομα α�χείου πακέτου με την εντολή εγκατάστασης"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -833,7 +818,7 @@ msgstr ""
 "Δεν β�έθηκε το πακέτο \"%s\", και πε�ισσότε�α από 40\n"
 "πακέτα πε�ιέχουν το \"%s\" στο όνομά τους.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -842,12 +827,12 @@ msgstr ""
 "Δεν β�έθηκε το πακέτο \"%s\".  Πά�αυτα τα ακόλουθα\n"
 "πακέτα πε�ιέχουν \"%s\" στο όνομά τους:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Δεν β�έθηκε πακέτο με όνομα ή πε�ιγ�αφή που να ται�ιάζει στο \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -865,7 +850,7 @@ msgstr ""
 "Δεν β�έθηκε πακέτο να ται�ιάζει στο \"%s\".  Πά�αυτα, τα ακόλουθα\n"
 "πακέτα πε�ιέχουν το \"%s\" στην πε�ιγ�αφή τους:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Κακός χα�ακτή�ας ενέ�γειας '%c'\n"
@@ -890,40 +875,32 @@ msgstr "Σφάλμα "
 msgid "Changelog download failed: %s"
 msgstr "Α�χείο Αλλαγής του %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Δεν β�έθηκε π�όγ�αμμα εμφάνισης, είναι σωστά εγκατεστημένο το σ�στημα;"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"το %s δεν είναι επίσημο πακέτο του Debian, δεν μπο�ώ να εμφανίσω το "
-"ημε�ολόγιο αλλαγών του."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Δεν β�έθηκε το ημε�ολόγιο αλλαγών του %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 #| msgid "Couldn't find a changelog for %s"
 msgid "Couldn't run pager %s"
 msgstr "Δεν β�έθηκε το ημε�ολόγιο αλλαγών του %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "Σ: Η εντολή clean δεν παί�νει ο�ίσματα\n"
+msgid "The clean command takes no arguments"
+msgstr "Η εντολή clean δεν παί�νει ο�ίσματα"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Del %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 #| msgid "Unable to look up your home directory, saving to /tmp/function_pkgs!"
 msgid "Unable to lock the download directory"
@@ -931,65 +908,56 @@ msgstr ""
 "Δεν μπό�εσα να β�ω τον π�οσωπικό σας κατάλογο, σώζω στο α�χείο /tmp/"
 "function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Del %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "Σ: Η εντολή autoclean δεν παί�νει ο�ίσματα\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Η εντολή autoclean δεν παί�νει ο�ίσματα"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Θα απελευθε�ώσει %sB χώ�ο στο δίσκο\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Ελευθε�ώθηκαν %sB χώ�ου στο δίσκο\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ακυ�η λειτου�γία %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Απ�όσμενο "
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
-"Αδ�νατη η ασφαλής επίλυση των εξα�τήσεων, π�οσπάθεια με --full-resolver.\n"
+"Αδ�νατη η ασφαλής επίλυση των εξα�τήσεων, π�οσπάθεια με --full-resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Εγκατάλειψη.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
+msgid "download: you must specify at least one package to download"
 msgstr ""
-"μεταφό�τωση: θα π�έπει να καθο�ίσετε ένα τουλάχιστον πακέτο για κατέβασμα\n"
+"μεταφό�τωση: θα π�έπει να καθο�ίσετε ένα τουλάχιστον πακέτο για κατέβασμα"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Αδ�νατη η ανάγνωση της λίστας πηγών  "
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Δεν β�έθηκε πακέτο με όνομα \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1031,22 +999,14 @@ msgid "[Working]"
 msgstr "[Λειτου�γεί]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: απαιτείται τουλάχιστον ένα ό�ισμα (ο κατάλογος \n"
-"στον οποίον θα γ�αφο�ν τα α�χεία).\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Δεν υπά�χει τέτοιο πακέτο \"%s\""
+"extract-cache-entries: απαιτείται τουλάχιστον ένα ό�ισμα (ο κατάλογος στον "
+"οποίον θα γ�αφο�ν τα α�χεία)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
@@ -1054,11 +1014,10 @@ msgstr ""
 "π�ος εκτέλεση.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "Σ: Η εντολή forget-new δεν παί�νει ο�ίσματα\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Η εντολή forget-new δεν παί�νει ο�ίσματα"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Θα ξεχάσει τα πακέτα που είναι νέα\n"
@@ -1170,18 +1129,18 @@ msgstr "Τα ακόλουθα πακέτα θα αναβαθμιστο�ν:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Θα γίνει ��θμιση των ακόλουθων με�ικά εγκατεστημένων πακέτων:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Τα ακόλουθα ΑΠΑΡΑΙΤΗΤΑ πακέτα θα ΑΦΑΙΡΕΘΟΥ�!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "Τα ακόλουθα ΑΠΑΡΑΙΤΗΤΑ πακέτα θα γίνουν ΕΛΑΤΩΜΑΤΙΚΑ από αυτή την ενέ�γεια:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1190,16 +1149,16 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτή η ενέ�γεια θα π�οξενήσει δυσλειτου�γίες στο σ�στημα!\n"
 "         ΜΗ� συνεχίσετε εκτός αν γνω�ίζετε ΑΚΡΙΒΩΣ τι κάνετε!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "�αι γνω�ίζω ότι είναι μια πολ� κακή ιδέα"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Για να συνεχίσετε, πληκτ�ολογήστε την φ�άση \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1217,7 +1176,7 @@ msgstr ""
 "για αυτό θέλετε\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1227,7 +1186,7 @@ msgstr ""
 "η πα�άμετ�ος\n"
 "                  %s::CmdLine::Ignore-Trust-Violations είναι 'αληθής'!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1241,7 +1200,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1250,100 +1209,100 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr ""
 "Θέλετε να αγνοήσετε αυτήν την π�οειδοποίηση και να π�οχω�ήσετε\n"
 "ο�τως ή άλλως;\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Για να συνεχίσετε, δώστε \"%s\", για να εγκαταλείψετε, \"%s\": "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Μη αναγνω�ίσιμη είσοδος. Δώστε είτε \"%s\" ή \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Τα ακόλουθα πακέτα είναι ΠΡΟΤΕΙ�ΟΜΕ�Α αλλά ΔΕ� θα εγκατασταθο�ν:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Τα ακόλουθα πακέτα είναι ΠΡΟΤΕΙ�ΟΜΕ�Α αλλά ΔΕ� θα εγκατασταθο�ν:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Δεν θα εγκατασταθο�ν, αναβαθμιστο�ν ή αφαι�εθο�ν πακέτα.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu πακέτα αναβαθμίζονται, %lu νεο-εγκατεστημένα, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu επενεγκατεστημένα, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu υποβαθμισμένα, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu για αφαί�εση και %lu δεν αναβαθμίστηκαν.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Χ�ειάζεται να κατεβο�ν %sB/%sB α�χείων. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Χ�ειάζεται να κατεβο�ν %sB α�χείων. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Μετά την αποσυμπίεση θα χ�ησιμοποιηθο�ν %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Μετά την αποσυμπίεση θα ελευθε�ωθο�ν %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Δεν υπά�χουν πακέτα για εμφάνιση -- δώστε τα ονόματα των πακέτων μετά το "
 "'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Πατήστε Return για συνέχεια"
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Δεν β�έθηκαν πακέτα -- γ�άψτε τα ονόματα των πακέτων μετά το 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1352,30 +1311,30 @@ msgstr ""
 "Δεν β�έθηκαν πακέτα -- εισάγετε μηδενική ή πε�ισσότε�ες �ίζες της αναζήτησης "
 "ακολουθο�μενες από το πακέτο π�ος επιβεβαίωση.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "ν: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "συνεχίστε με την εγκατάσταση"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "ο: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "εγκατάλειψη και έξοδος από το π�όγ�αμμα"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1383,12 +1342,12 @@ msgstr ""
 "εμφάνιση πλη�οφο�ίας για ένα ή πε�ισσότε�α πακέτα; τα ονόματα των πακέτων "
 "π�έπει να ακολουθο�ν το 'i'"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1396,39 +1355,39 @@ msgstr ""
 "εμφάνιση των α�χείων αλλαγών του Debian για ένα ή πε�ισσότε�α πακέτα; τα "
 "ονόματα των πακέτων θα π�έπει να ακολουθο�ν το 'c'"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "εναλλαγή επιλογής εμφάνισης της πλη�οφο�ίας εξα�τήσεων"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "εναλλαγή επιλογής εμφάνισης των αλλαγών στο μέγεθος των πακέτων"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "εναλλαγή επιλογής εμφάνισης των α�ιθμών έκδοσης"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1437,27 +1396,27 @@ msgstr ""
 "εξηγήστε γιατί η εγκατάσταση ενός πακέτου θα οδηγο�σε στην εγκατάσταση ενός "
 "άλλου."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "εκτελέστε τον αυτόματο επιλυτή εξα�τήσεων για να διο�θώσετε τις "
 "π�οβληματικές εξα�τήσεις."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "είσοδος στην πλή�η οπτική διεπαφή"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1470,49 +1429,49 @@ msgstr ""
 "Η ενέ�γεια αυτή θα εφα�μοστεί σε όλα τα πακέτα που έχετε βάλει στη λίστα. Οι "
 "ακόλουθες ενέ�γειες είναι διαθέσιμες:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' για εγκατάσταση πακέτων"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M' για εγκατάσταση πακέτων και την άμεση σήμανσή τους σαν αυτόματα "
 "εγκατεστημμένων"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' αφαί�εση πακέτων"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' για πλή�η αφαί�εση πακέτων"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' διατή�ηση των πακέτων σε αναμονή"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 "';' διατή�ηση των πακέτων στην τω�ινή τους κατάσταση χω�ίς την τοποθέτησή "
 "τους σε αναμονή"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' επισήμανση πακέτων σαν αυτόματα εγκατεστημμένων"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' επισήμανση πακέτων σαν χει�οκίνητα εγκατεστημμένων"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "'&BD' για να εγκαταστήσετε τις build-εξα�τήσεις ενός πακέτου."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1520,30 +1479,30 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 #| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' επισήμανση πακέτων σαν αυτόματα εγκατεστημμένων"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Επιβάλλει:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1552,20 +1511,20 @@ msgstr ""
 "επιλ�σετε οι ίδιοι με το χέ�ι ή να πληκτ�ολογήσετε 'n' για να κλείσετε την "
 "εφα�μογή."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Θέλετε να συνεχίσετε ; [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "�α επιλυθο�ν οι εξα�τήσεις αυτές με το χέ�ι; [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Ακυ�η απάντηση.  Πα�ακαλώ εισάγετε μια έγκυ�η εντολή ή '?' για βοήθεια.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1574,7 +1533,7 @@ msgstr ""
 "εγκαταστήσετε ένα πακέτο), 'R' για να π�οσπαθήσετε αυτόματη επίλυση των "
 "εξα�τήσεων ή '�' για τε�ματισμό."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1585,7 +1544,7 @@ msgstr ""
 "Θα εμφανιστο�ν πλη�οφο�ίες εξα�τήσεων.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1596,7 +1555,7 @@ msgstr ""
 "Δεν θα εμφανιστο�ν πλη�οφο�ίες εξα�τήσεων.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1607,7 +1566,7 @@ msgstr ""
 "Θα εμφανιστο�ν πλη�οφο�ίες εκδόσεων.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1618,7 +1577,7 @@ msgstr ""
 "Δεν θα εμφανιστο�ν πλη�οφο�ίες εκδόσεων.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1629,7 +1588,7 @@ msgstr ""
 "Θα εμφανιστο�ν πλη�οφο�ίες αλλαγής μεγεθών.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1782,6 +1741,11 @@ msgstr ""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Πε�ίμενα μια έκδοση του \"%s\" μετά το \"%s\""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Δεν υπά�χει τέτοιο πακέτο \"%s\""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1938,7 +1902,7 @@ msgstr ""
 "Θέλω να επιλ�σω τις εξα�τήσεις, αλλά δεν έχει δημιου�γηθεί επιλυτής "
 "εξα�τήσεων."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1968,7 +1932,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Οι ακόλουθες εντολές είναι διαθέσιμες:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Α�χείο για εγγ�αφή της κατάστασης επίλυσης:"
 
@@ -2001,7 +1965,7 @@ msgstr ""
 "να συνεχίσετε\n"
 "           την αναζήτηση, αλλά κάποιες λ�σεις θα είναι απ�οσπέλαστες."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -2010,28 +1974,27 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 #| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Αδ�νατη η επίλυση των εξα�τήσεων για την αναβάθμιση (δεν β�έθηκε λ�ση)."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 #| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Αδ�νατη η επίλυση των εξα�τήσεων για την αναβάθμιση (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "αποτυχία του iconv για το %s.\n"
+msgid "iconv of %s failed"
+msgstr "αποτυχία του iconv για το %s"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "αναζήτηση: Θα π�έπει να ο�ίσετε ένα τουλάχιστον αντικείμενο\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "αναζήτηση: Θα π�έπει να ο�ίσετε ένα τουλάχιστον αντικείμενο"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2075,7 +2038,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Τα ακόλουθα πακέτα έχουν ανεπίλυτες εξα�τήσεις:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2299,7 +2262,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Πα�έχει"
 
@@ -2313,15 +2276,9 @@ msgstr "Πε�ιγ�αφή: "
 msgid "Homepage: "
 msgstr "Homepage: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Αδ�νατος ο εντοπισμός του πακέτου %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Αδ�νατο το parse του π�οτ�που %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Δε β�έθηκαν πακέτα"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2332,14 +2289,13 @@ msgstr "Θα κατεβο�ν/εγκατασταθο�ν/αφαι�εθο�ν π
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Εσωτε�ικό Σφάλμα, Η ταξινόμηση δεν τελείωσε"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Διαγ�άφονται τα πε�ιττά μεταφο�τωμένα α�χεία"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: Η εντολή update δεν παί�νει ο�ίσματα\n"
+msgid "The update command takes no arguments"
+msgstr "Η εντολή update δεν παί�νει ο�ίσματα"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2357,137 +2313,159 @@ msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 "%s: πολ� λίγα ο�ίσματα; πε�ίμενα τουλάχιστον ένα όνομα tag και ένα πακέτο.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Δεν β�έθηκε υποψήφια έκδοση για το %s\n"
+msgid "No candidate version found for %s"
+msgstr "Δεν β�έθηκε υποψήφια έκδοση για το %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Δεν β�έθηκε τ�έχουσα ή υποψήφια έκδοση για το %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "Δεν β�έθηκε τ�έχουσα ή υποψήφια έκδοση για το %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Αδ�νατη η ε��εση α�χείου \"%s\" για το πακέτο \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Αδ�νατη η ε��εση α�χείου \"%s\" για το πακέτο \"%s\""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Αδ�νατη ή ε��εση έκδοσης\"%s\" για το πακέτο \"%s\"\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Αδ�νατη ή ε��εση έκδοσης\"%s\" για το πακέτο \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Εσωτε�ικό σφάλμα: άκυ�η τιμή %i πέ�ασε την εντολή cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Εσωτε�ικό σφάλμα: άκυ�η τιμή %i πέ�ασε την εντολή cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Δεν γίνεται να καθο�ίσετε και α�χείο και έκδοση για ένα πακέτο\n"
-
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't find a changelog for %s"
-msgid "Couldn't find task '%s'"
-msgstr "Δεν β�έθηκε το ημε�ολόγιο αλλαγών του %s"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Δεν γίνεται να καθο�ίσετε και α�χείο και έκδοση για ένα πακέτο"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d σπασμένο [%+d]"
 msgstr[1] "%d σπασμένα [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d αναβάθμιση [%+d]"
 msgstr[1] "%d αναβαθμίσεις [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d νέο [%+d]"
 msgstr[1] "%d νέα [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Τ�έχουσα κατάσταση: %F"
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "Υπά�χει ένα  %d καινο��ιο πα�ωχημένο πακέτο."
 msgstr[1] "Υπά�χουν  %d καινο��ια πα�ωχημένα πακέτα."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "Υπά�χει ένα  %d καινο��ιο πα�ωχημένο πακέτο."
 msgstr[1] "Υπά�χουν %d καινο��ια πα�ωχημένα πακέτα."
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Δεν υπά�χει ε�ωτηματικό που να ακολουθεί το όνομα του tag \"%s\""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Αδ�νατος ο εντοπισμός του πακέτου %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find task '%s'"
+msgstr "Δεν β�έθηκε το ημε�ολόγιο αλλαγών του %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Σημείωση: επιλέχθηκε ο σκοπός \"%s: %s\" για εγκατάσταση\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Δεν β�έθηκε το ημε�ολόγιο αλλαγών του %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 #| msgid "Packages"
 msgid "Package %s:"
 msgstr "Πακέτα"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 #| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Πηγαίο Πακέτο: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 #| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Α�χείο"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
 #| msgid "search: You must provide at least one search term\n"
-msgid "versions: You must provide at least one package selector\n"
+msgid "versions: You must provide at least one package selector"
 msgstr "αναζήτηση: Θα π�έπει να ο�ίσετε ένα τουλάχιστον αντικείμενο\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2510,7 +2488,7 @@ msgstr "Τ�έχον"
 msgid "Candidate"
 msgstr "Υποψήφιο"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Εγκατάσταση"
 
@@ -2614,23 +2592,20 @@ msgstr "Δεν μπο�ώ να β�ω έναν λόγο για την εγκατ
 msgid "Packages requiring %s:"
 msgstr "Πακέτα που εξα�τώνται από το %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Δεν υπά�χει πακέτο με το όνομα \"%s\"."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Αδ�νατο το parse με�ικών σχημάτων ται�ιάσματος."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
-"%s: αυτή η εντολή απαιτεί τουλάχιστον ένα ό�ισμα (το πακέτο π�ος "
-"διε�ε�νηση).\n"
+"%s: αυτή η εντολή απαιτεί τουλάχιστον ένα ό�ισμα (το πακέτο π�ος διε�ε�νηση)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2657,11 +2632,11 @@ msgstr "ΜΗ ΙΚΑ�ΟΠΟΙΗΜΕ�Α"
 msgid "UNAVAILABLE"
 msgstr "ΜΗ ΔΙΑΘΕΣΙΜΑ"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Ετικέτες"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Ετικέτες Χ�ήστη"
 
@@ -2875,33 +2850,33 @@ msgstr ""
 "ανάγνωσης. Οποιεσδήποτε αλλαγές κάνετε στην καταστάση των πακέτων ΔΕ� θα "
 "διατη�ηθο�ν!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 #| msgid "allow_choices"
 msgid "allowed"
 msgstr "επίτ�εψε_επιλογές"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "κ��ιο"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2968,38 +2943,46 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "Δεν είναι διαθέσιμη η cache για το πακέτο. Αδυναμία κατεβάσματος και "
 "εγκατάστασης των πακέτων."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 "Εσωτε�ικό σφάλμα: δεν ήταν δυνατή η δημιου�γία της λίστας μεταφό�τωσης "
 "πακέτων "
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Αποτυχία λήψης του %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Αδ�νατη η μεταφό�τωση με�ικών α�χείων, ίσως αν δοκιμάζατε με aptitude update "
+"ή το --fix-missing;"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Αδυναμία διό�θωσης των μη διαθέσιμων πακέτων"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Αποτυχία εγκατάστασης ενός πακέτου. Π�οσπάθεια επαναφο�άς:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3151,13 +3134,13 @@ msgstr ""
 "\n"
 "Η καταγ�αφή ολοκλη�ώθηκε.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 #| msgid "Downloading packages"
 msgid "Filtering packages"
@@ -3276,20 +3259,20 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Οι κατάλογοι των πακέτων είναι κατεστ�αμένοι. Το: %s δεν υπά�χει"
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, fuzzy, c-format
 #| msgid "ChangeLog of %s"
 msgid "Changelog of %s"
 msgstr "Α�χείο Αλλαγής του %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "Διε�θυνση που θα χ�ησιμοποιηθεί για τη μεταφό�τωση των α�χείων αλλαγών"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
@@ -3341,28 +3324,29 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Αδ�νατο το parse του π�οτ�που %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Δημιου�γία βάσης των ετικετών"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 #| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Μη εγκατεστημένο"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 #| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Μη εγκατεστημένο"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3525,43 +3509,43 @@ msgstr ""
 msgid "_File"
 msgstr "Ψευδές"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Ολοκλή�ωση όλων των εκκ�εμών εγκαταστάσεων/αφαι�έσεων"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Έλεγχος για νέες εκδόσεις πακέτων"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Σημείωση όλων των αναβαθμιζομένων πακέτων που δεν κ�ατο�νται πλέον για "
 "αναβάθμιση"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Ξέχασε τα πακέτα που είναι \"νέα\""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Ακ��ωση όλων των εκκ�εμών εγκαταστάσεων, αφαι�έσεων, σε αναμονή και "
 "αναβαθμίσεων."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Διαγ�αφή των α�χείων πακέτου που έχουν μεταφο�τωθεί π�οηγουμένως"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Διαγ�αφή των α�χείων πακέτων που δεν μπο�ο�ν πλέον να μεταφο�τωθο�ν"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Επαναφό�τωση του cache των πακέτων"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3571,7 +3555,7 @@ msgstr ""
 "Εκτελέστε την εντολή 'su' για να γίνετε ο χ�ήστης root.  Αυτή θα "
 "επανεκτελέσει το π�όγ�αμμα, αλλά οι �υθμίσεις θα διατη�ηθο�ν"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Έξοδος από το π�όγ�αμμα"
 
@@ -3579,7 +3563,7 @@ msgstr "Έξοδος από το π�όγ�αμμα"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Επαναφο�ά της τελευταίας ε�γασίας ή ομάδας ε�γασιών σε πακέτο."
 
@@ -3616,7 +3600,7 @@ msgid "_Help"
 msgstr "Βοήθεια"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3626,19 +3610,19 @@ msgstr ""
 msgid "Update"
 msgstr "Αναβάθμιση λίστας"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Πακέτα"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Π�οεπισκόπηση"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Resolver"
 
@@ -3846,7 +3830,7 @@ msgid "Fix Manually"
 msgstr "Εγχει�ίδιο"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Αναβάθμιση"
 
@@ -4444,11 +4428,11 @@ msgstr "Εγκατεστημένο"
 msgid "Reinstall"
 msgstr "Επανεγκατάσταση"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Υποβάθμιση έκδοσης"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Αφαί�εση"
 
@@ -4487,7 +4471,7 @@ msgstr "ΕφαÏ�μογή φίλτÏ�ου στον κατάλογο των πακÎ
 msgid "Download already running."
 msgstr "Μεταφό�τωση... "
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Ήδη β�ίσκεται σε εξέλιξη μια διαδικασία αναβάθμισης ή εγκατάστασης."
 
@@ -4555,29 +4539,29 @@ msgstr "Δεν υπά�χουν \"σπασμένα\" πακέτα."
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Αδ�νατη η αντικατάσταση του %s με νέο α�χείο �υθμίσεων"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Μεταφό�τωση πακέτων"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Δεν υπά�χουν \"σπασμένα\" πακέτα."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Δεν υπά�χουν \"σπασμένα\" πακέτα."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 #| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Επίλυση Εξα�τήσεων"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 #| msgid "No packages are broken."
 msgid "%d package is broken"
@@ -4585,13 +4569,13 @@ msgid_plural "%d packages are broken."
 msgstr[0] "Δεν υπά�χουν \"σπασμένα\" πακέτα."
 msgstr[1] "Δεν υπά�χουν \"σπασμένα\" πακέτα."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 #| msgid "%s changes"
 msgid "View changes"
 msgstr "%s αλλαγές"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 #| msgid "%s changes"
 msgid "Apply changes"
@@ -4600,7 +4584,7 @@ msgstr "%s αλλαγές"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 #| msgid "%d install"
 #| msgid_plural "%d installs"
@@ -4612,7 +4596,7 @@ msgstr[1] "%d εγκατάσταση"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 #| msgid "failed to remove %s"
 msgid "%d package to remove"
@@ -4620,62 +4604,62 @@ msgid_plural "%d packages to remove"
 msgstr[0] "αποτυχία αφαί�εσης του %s"
 msgstr[1] "αποτυχία αφαί�εσης του %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 #| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "ΜέγεθοςΛήψης"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 #| msgid "not installed"
 msgid "Not implemented"
 msgstr "μη εγκατεστημένο"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 #| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Εγκατεστημένο"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 #| msgid "^Purge"
 msgid "Purge"
 msgstr "^Διαγ�αφή"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Διατή�ηση"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Αναμονή"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 #| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Εγχει�ίδιο Χ�ήσης"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4720,7 +4704,7 @@ msgstr "όχι"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4771,19 +4755,19 @@ msgstr "το %s; θα εγκατασταθεί αυτόματα"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 #| msgid "Search"
 msgid "Searching..."
 msgstr "Αναζήτηση"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 #| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Δημιου�γία εμφάνισης"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Δημιου�γία εμφάνισης"
@@ -5545,115 +5529,116 @@ msgstr "Άγνωστος τ�πος ταξινόμησης: '%s'"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 #| msgid "By-name sorting policies take no arguments"
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Οι πολιτικές ταξινομήσεων κατ' όνομα δε δέχονται πα�αμέτ�ους"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Μη έγκυ�ο μηδενικο� μήκους όνομα πολιτικής ταξινόμησης"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Αταί�ιαστη '(' στην πε�ιγ�αφή της πολιτική ταξινόμησης"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Μη έγκυ�η πολιτική ταξινόμησης '%s'"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Αδυναμία αποκωδικοποίησης multibyte συμβολοσει�άς μετά το \"%ls\""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 "Αδυναμία αποκωδικοποίησης συμβολοσει�άς ευ�έως-χα�ακτή�α μετά το \"%s\""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s μεταγλωττίστηκε στις %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Π�όγ�αμμα μεταγλώττισης : g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Μεταγλωττίστηκε με:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  έκδοση apt %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  Έκδοση NCurses: Άγνωστη\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  Έκδοση NCurses %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  έκδοση libsigc++: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Ενε�γοποίηση υποστή�ιξης Ept .\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Απενε�γοποίηση υποστή�ιξης Ept.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 #| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  έκδοση apt %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 #| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  έκδοση apt %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Απενε�γοποίηση υποστή�ιξης Ept.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 #| msgid "%s %s compiled at %s %s\n"
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s μεταγλωττίστηκε στις %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Qt support disabled.\n"
 msgstr "  Απενε�γοποίηση υποστή�ιξης Ept.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5661,32 +5646,32 @@ msgstr ""
 "\n"
 "Τ�έχουσα έκδοση βιβλιοθήκης:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  Έκδοση NCurses: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  έκδοση cwidget: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Έκδοση Apt: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Χ�ήση: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [επιλογές] <ενέ�γεια> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5696,44 +5681,44 @@ msgstr ""
 "λειτου�γία):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Εγκατάσταση/αναβάθμιση πακέτου.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Αφαί�εση πακέτων.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Αφαί�εση πακέτων μαζί με τα α�χεία �υθμίσεών τους.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Τοποθέτηση πακέτων σε αναμονή.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Ακ��ωση της εντολής αναμονή για πακέτο.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 "markauto    - Σήμανση των πακέτων σαν να έχουν εγκατασταθεί αυτόματα.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr ""
 "unmarkauto   - Σήμανση των πακέτων σαν να έχουν εγκατασταθεί χει�οκίνητα.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5742,17 +5727,17 @@ msgstr ""
 " forbid-version - Απαγό�ευση της αναβάθμισης ενός πακέτου σε μια "
 "συγκεκ�ιμένη έκδοση.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr "update       - Μεταφό�τωση λιστών των νέων/αναβαθμιζόμενων πακέτων.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Εκτέλεση μιας ασφαλο�ς αναβάθμισης.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5761,55 +5746,55 @@ msgstr ""
 " full-upgrade - Εκτέλεση μιας αναβάθμισης, πιθανόν με εγκατάσταση και "
 "αφαί�εση πακέτων.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 #| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' για να εγκαταστήσετε τις build-εξα�τήσεις ενός πακέτου."
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr "forget-new   - Ξέχασε ποια πακέτα είναι \"νέα\".\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr ""
 " search       - Αναζήτηση ενός πακέτου με βάση το όνομα ή/και έκφ�αση.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Εμφάνιση λεπτομε�ειών σχετικά με ένα πακέτο.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Εμφάνιση λεπτομε�ειών σχετικά με ένα πακέτο\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Διαγ�αφή μεταφο�τομένων πακέτων.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Διαγ�αφή παλαιότε�α μεταφο�τομένων α�χεία πακέτων.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Εμφάνισε το ημε�ολόγιο αλλαγών ενός πακέτου.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Μεταφό�τωση ενός α�χείου .deb για ένα πακέτο.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5818,7 +5803,7 @@ msgstr ""
 "επανεγκατάσταση    - Κατέβασμα και (πιθανόν) επανεγκατάσταση ενός ήδη\n"
 "                     εγκατεστημένου πακέτου.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5830,7 +5815,7 @@ msgstr ""
 "                του γιατί ένα ή πε�ισσότε�α πακέτα θα απαιτο�σαν το "
 "συγκεκ�ιμένο πακέτο.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5845,47 +5830,47 @@ msgstr ""
 "                οδηγήσουν σε μια σ�γκ�ουση με το δοσμένο πακέτο αν "
 "εγκατασταθο�ν.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Επιλογές:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Αυτό το κείμενο βοήθειας.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Αυτό το κείμενο βοήθειας\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 " -s             Εξομοίωση ενε�γειών, αλλά να μην π�αγματοποιηθο�ν στην "
 "π�αγματικότητα.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -5893,12 +5878,12 @@ msgstr ""
 " -d             Μόνο μεταφό�τωση των πακέτων, να μην γίνει εγκατάσταση ή "
 "απεγκατάσταση κάτι.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr "-P             �α γίνονται πάντα ε�ωτήσεις επιβεβαίωσης ή ενέ�γειες.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5906,7 +5891,7 @@ msgstr ""
 "-y            Υπέθεσε ότι η απάντηση σε απλές ε�ωτήσεις ναι/όχι είναι "
 "'ναι'.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5916,7 +5901,7 @@ msgstr ""
 "δείτε\n"
 "               εγχει�ίδιο χ�ήσης.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5926,7 +5911,7 @@ msgstr ""
 "αναζήτησης,\n"
 "               δείτε το εγχει�ίδιο χ�ήσης.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
@@ -5934,32 +5919,32 @@ msgstr ""
 " -w width       Καθο�ισμός του πλάτους εμφάνισης των αποτελεσμάτων "
 "αναζήτησης.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr "-f             Επιθετική π�οσπάθεια επίλυσης των σπασμένων πακέτων.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 "-V             Εμφάνιση των εκδόσεων των πακέτων που π�όκειται να "
 "εγκατασταθο�ν.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 "-D             Εμφάνιση των εξα�τήσεων των αυτόματα αλλαγμένων πακέτων.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 "-Z\t\t    Εμφάνιση της αλλαγής μεγέθους στο εγκατεστημένο κάθε πακέτου.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5968,7 +5953,7 @@ msgstr ""
 "-v             Εμφανίζει επιπλέον πλη�οφο�ίες (μπο�εί να ο�ιστεί πολλαπλές "
 "φο�ές).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
@@ -5976,7 +5961,7 @@ msgstr ""
 " -t [release]   Ο�ίστε την έκδοση από ποια πακέτα θα π�έπει να "
 "εγκατασταθο�ν.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5986,12 +5971,12 @@ msgstr ""
 "σταδιακής\n"
 "                π�οόδου.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=val     Άμεσος καθο�ισμός μια πα�αμέτ�ου με όνομα 'key'.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -6000,35 +5985,35 @@ msgstr ""
 " --with(out)-recommends\tΚαθο�ισμός αντιμετώπισης των συνιστώμενων ως\n"
 "                ισχυ�ών εξα�τήσεων.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fname       Ανάγνωση των εκτεταμένων πλη�οφο�ιών από το α�χείο fname.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr "u       : Μεταφό�τωση νέας λίστας πακέτων κατά την εκκίνηση.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             Αυτό το κείμενο βοήθειας\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr "-i             Εκτέλεση μιας εγκατάστασης κατά την εκκίνηση.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Αυτό το APT έχει Δυνάμεις Υπε�Αγελάδας.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 #| msgid "true"
 msgid "trace"
@@ -6036,13 +6021,13 @@ 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:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 #| msgid "no"
 msgid "info"
@@ -6050,13 +6035,13 @@ 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:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 #| msgid "Err "
 msgid "error"
@@ -6064,7 +6049,7 @@ 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:408
+#: src/main.cc:374
 #, fuzzy
 #| msgid "false"
 msgid "fatal"
@@ -6072,95 +6057,75 @@ 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:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
 #| msgid "Invalid operation %s"
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Ακυ�η λειτου�γία %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Πε�ίμενα έναν α�ιθμό μετά το -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Πε�ίμενα έναν α�ιθμό μετά το -q=, έλαβα %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o απαιτεί μια πα�άμετ�ο της μο�φής key=value, έλαβα %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Δεν υπά�χει ε�ωτηματικό που να ακολουθεί το όνομα του tag \"%s\".\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "ΠΑΡΑΞΕ�Ο: ελήφθη άγνωστος κώδικας πα�άμετ�ου\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 #| msgid "Package"
 msgid "first-package"
 msgstr "Πακέτο"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 #| msgid "All Packages"
 msgid "all-packages"
 msgstr "Όλα πακέτα"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -6168,42 +6133,36 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 #| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Μόνο ένα από το -u και i μπο�ο�ν να ο�ιστο�ν\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 #| msgid ""
 #| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "το -u και -i δεν μπο�εί να ο�ιστο�ν στη λειτου�γία γ�αμμής εντολών(π.χ. με "
 "το 'install')"
 
-#: src/main.cc:1105
-#, fuzzy
-#| msgid "-u and -i may not be specified with a command"
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "το -u και -i δεν μπο�ο�ν να ο�ιστο�ν στην ίδια εντολή"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Αγνωστη εντολή \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Αγνωστη εντολή \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Uncaught exception: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -6221,7 +6180,7 @@ msgstr "Αναζήτηση του: "
 msgid "Search backwards for: "
 msgstr "Αναζήτηση π�ος τα πίσω του: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "�α�καλιευτής"
 
@@ -6437,7 +6396,7 @@ msgstr "Κωδικοποίηση του mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Πακέτο"
 
@@ -6518,8 +6477,8 @@ msgstr "<Μ/Δ>"
 msgid "<none>"
 msgstr "<καμία>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "εικονικά"
@@ -6655,7 +6614,7 @@ msgid "Internal error: Default column string is unparsable"
 msgstr ""
 "Εσωτε�ικό σφάλμα: Αδ�νατη η ανάλυση της π�οκαθο�ισμένης στήλης χα�ακτή�ων"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Ε�γασίες"
 
@@ -6814,11 +6773,11 @@ msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 "Ο δείκτης ται�ιάσματος %ls είναι πολ� μεγάλος, διαθέσιμες ομάδες είναι (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "ΠΑΚΕΤΑ ΧΩΡΙΣ ΕΤΙΚΕΤΤΕΣ"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6829,10 +6788,6 @@ msgstr ""
 "debtags δεν είναι πα�ο�σα (η εγκατάσταση του debtags πιθανόν να διο�θώσει "
 "αυτό το π�όβλημα)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "ΕΤΙΚΕΤΤΑ ΠΟΥ ΛΕΙΠΕΙ"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Πηγαίο Πακέτο: "
@@ -7466,7 +7421,7 @@ msgstr "Φό�τωση του cache"
 msgid "Really quit Aptitude?"
 msgstr "Έξοδος από το Aptitude; Σίγου�α;"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Άλλαξε την συμπε�ιφο�ά του aptitude"
 
@@ -7549,7 +7504,7 @@ msgstr ""
 msgid "License"
 msgstr "Άδεια Χ�ήσης"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 "Δείτε τους ό�ους κάτω από τους οποίους μπο�είτε να αντιγ�άψετε και να "
@@ -7572,7 +7527,7 @@ msgstr "Βοήθεια Online"
 msgid "View a brief introduction to aptitude"
 msgstr "Δες μια σ�ντομη εισαγωγή στο aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Βοήθεια"
 
@@ -7601,7 +7556,7 @@ msgstr "Εγχει�ίδιο"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Εμφάνιση των πιο συχνών ε�ωτήσεων"
 
@@ -7645,15 +7600,15 @@ msgstr ""
 "κατάλογο και όλα τα πε�ιεχόμενά του; Αν επιλέξετε \"Όχι\", δεν θα ξαναδείτε "
 "αυτό το μήνυμα."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Εμφάνιση π�οόδου της διαδικασίας μεταφό�τωσης πακέτου"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Κατέβασμα Πακέτου"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7665,35 +7620,35 @@ msgstr ""
 "%Bπα�αβίαση της ασφάλειας του συστήματός σας%b.  Π�οχω�ήστε στην εγκατάσταση "
 "μόνο αν είστε βέβαιοι ότι αυτό θέλετε.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [έκδοση %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Χω�ίς πλάκα, συνέχεια"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Εγκατάλειψη εγκατάστασης"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Π�οεπισκόπηση της εγκατάστασης των πακέτων"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Εμφάνιση και/ή ��θμιση των ενε�γειών που θα εκτελεστο�ν"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Κάποια πακέτα ήταν κατεστ�αμμένα και έχουν διο�θωθεί:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Δεν υπά�χει λ�ση για τα π�οβλήματα αυτά εξα�τήσεων!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7702,7 +7657,7 @@ msgstr ""
 "Εξάντληση χ�όνου κατά την π�οσπάθεια επίλυσης των εξα�τήσεων (πατήστε \"%s\" "
 "για να π�οσπαθήσετε πιο επίμονα)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7710,19 +7665,19 @@ msgstr ""
 "Η εγκατάσταση/αφαί�εση πακέτων απαιτεί π�ονόμια διαχει�ιστή, που δεν έχετε "
 "αυτή τη στιγμή. Θα θέλατε να πε�άσετε στο λογα�ιασμό χ�ήστη root;"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Μετατ�οπή σε root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Οχι μετατ�οπή σε root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Δεν έχουν επιλεγεί πακέτα για εγκατάσταση, αφαί�εση ή αναβάθμιση."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7732,19 +7687,19 @@ msgstr ""
 "μπο�ο�σαν να αναβαθμιστο�ν, αλλά επιλέξατε να μην τα αναβαθμίσετε. "
 "Πληκτ�ολογήστε \"U\" για να π�οετοιμάσετε μια αναβάθμιση."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Ανανέωση της λίστας πακέτων"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Εμφάνιση π�οόδου της διαδικασίας ανανέωσης πακέτων"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Αναβάθμιση λίστας"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7752,23 +7707,23 @@ msgstr ""
 "Η ενημέ�ωση των καταλόγων των πακέτων απαιτεί π�ονόμια διαχει�ιστή, που δεν "
 "έχετε αυτή τη στιγμή. Θα θέλατε να αλλάξετε στον λογα�ιασμό του χ�ήστη root;"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Σκοτώστε την ώ�α σας β�ίσκοντας νά�κες"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Δεν επιτ�έπεται εκκαθά�ιση κατά τη διά�κεια της μεταφό�τωσης"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Διαγ�άφονται τα μεταφο�τωμένα α�χείων"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Τα μεταφο�τωμένα α�χεία έχουν διαγ�αφεί"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7780,12 +7735,12 @@ msgstr ""
 "Η ενημέ�ωση των καταλόγων των πακέτων απαιτεί π�ονόμια διαχει�ιστή, που δεν "
 "έχετε αυτή τη στιγμή. Θα θέλατε να αλλάξετε στον λογα�ιασμό του χ�ήστη root;"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 "%Το α�χείο της cache του apt δεν είναι διαθέσιμο. Αδ�νατο το auto-clean."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7794,7 +7749,7 @@ msgstr ""
 "Τα πε�ιττά α�χεία που έχετε κατεβάσει έχουν διαγ�αφεί, απελευθε�ώνοντας %sB "
 "χώ�ου στον δίσκο."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7806,122 +7761,122 @@ msgstr ""
 "Η ενημέ�ωση των καταλόγων των πακέτων απαιτεί π�ονόμια διαχει�ιστή, που δεν "
 "έχετε αυτή τη στιγμή. Θα θέλατε να αλλάξετε στον λογα�ιασμό του χ�ήστη root;"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Δεν υπά�χουν πε�ισσότε�ες λ�σεις."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Δεν μπο�ώ να β�ω μια εφα�μόσιμη λ�ση."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Εξάντληση χ�όνου κατά την π�οσπάθεια ε��εσης μιας λ�σης."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Επίλυση Εξα�τήσεων"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Ψάξιμο λ�σεων για τις μη ικανοποιημένες εξα�τήσεις"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Αδ�νατο το άνοιγμα του %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Λάθος κατά το \"άδειασμα\" της κατάστασης του resolver"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Εγκατάσταση/Αφαί�εση πακέτων"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Ενημέ�ωση της λίστας πακέτων"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Σημείωση Ανα^βαθμίσιμων"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "Ξέχασε τα νέα πακέτα"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Ακ�^�ωση των εκκ�εμών ενε�γειών"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "Εκκαθά�ιση του cache των πακέτων"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Εκκαθά�ιση ^πε�ιττών α�χείων"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "Επαναφό�τωση του cache πακέτων"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "Παίξε �α�καλιευτή"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Σ�νδεση ως root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "Έξοδος"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Αναί�εση"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Εγκατάσταση"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Σήμανση του τ�έχοντος πακέτου για εγκατάσταση ή αναβάθμιση"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Αφαί�εση"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Σήμανση του τ�έχοντος πακέτου για αφαί�εση"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Διαγ�αφή"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Σήμανση του τ�έχοντος πακέτου και των α�χείων �υθμίσεών του για αφαί�εση"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Κ�άτηση"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Ακ��ωση κάθε ενέ�γειας για το επιλεγμένο πακέτο"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Αναμονή"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7929,11 +7884,11 @@ msgstr ""
 "Ακ��ωση κάθε ενέ�γειας για το επιλεγμένο πακέτο, και π�οστασία του από "
 "μελλοντικές αναβαθμίσεις"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "^Αυτόματη Σήμανση"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7941,11 +7896,11 @@ msgstr ""
 "Επισημάνετε το επιλεγμένο πακέτο ως αυτόματα εγκατεστημένο. Θα αφαι�εθεί "
 "αυτόματα αν κανένα άλλο πακέτο δεν εξα�τάται από αυτό"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "^Χει�οκίνητη Σήμανση"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7953,11 +7908,11 @@ msgstr ""
 "Επισημάνετε το επιλεγμένο πακέτο ως χει�οκίνητα εγκατεστημένο. Δεν π�όκειται "
 "να αφαι�εθεί αν δεν το αφαι�έσετε εσείς χει�οκίνητα"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Απαγό�ευση έκδοσης"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7965,19 +7920,19 @@ msgstr ""
 "Απαγό�ευσε την εγκατάσταση της υποψήφιας έκδοσης του επιλεγμένου πακέτου. "
 "�εώτε�ες εκδόσεις του πακέτου θα εγκατασταθο�ν ως συνήθως"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "Π^λη�οφο�ίες"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Εμφάνισε πε�ισσότε�ες πλη�οφο�ίες για το επιλεγμένο πακέτο"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "Κυκλική εναλλαγή Πλη�οφο�ιών Πακέτου"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7987,60 +7942,60 @@ msgstr ""
 "μπο�εί να εμφανίζει την εκτενή πε�ιγ�αφή του πακέτου, μια πε�ίληψη της "
 "κατάστασης εξα�τήσεών του ή μια ανάλυση του γιατί το πακέτο είναι απα�αίτητο."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "Α^�χείο Αλλαγών"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Εμφάνισε το ημε�ολόγιο αλλαγών του Debian για το επιλεγμένο πακέτο"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Εξέταση της λ�σης"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Εξέτασε την πα�ο�σα λ�ση των π�οβλημάτων εξά�τησης."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Εφα�μογή της ^Λ�σης"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr ""
 "Εφα�μογή των ενε�γειών που πε�ιέχονται στην λ�ση που έχει τώ�α επιλεχθεί."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Επόμενη λ�ση"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Επέλεξε την επόμενη λ�ση στα π�οβλήματα εξα�τήσεων."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^Π�οηγο�μενη λ�ση"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Επέλεξε την π�οηγο�μενη λ�ση στα π�οβλήματα εξα�τήσεων."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^Π�ώτη λ�ση"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Επέλεξε την π�ώτη λ�ση στα π�οβλήματα εξα�τήσεων."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "^Τελευταία λ�ση"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -8048,38 +8003,38 @@ msgstr ""
 "Επέλεξε την τελευταία λ�ση στα π�οβλήματα εξα�τήσεων που έχουν δημιου�γηθεί "
 "μέχ�ι τώ�α."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Αλλαγή επιλογής ^Απο��ιφθέντων"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr ""
 "Αλλαγή επιλογής για την από��ιψη της ενέ�γειας που έχει αυτή την στιγμή "
 "επιλεχθεί."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Αλλαγή επιλογής ^Αποδεχθέντων"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr ""
 "Αλλαγή επιλογής αποδοχής της ενέ�γειας που έχει αυτή τη στιγμή επιλεχθεί."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Επιθεώ�ηση Στόχου"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Επιθεώ�ηση των πακέτων που θα επη��εαστο�ν από την επιλεγμένη ενέ�γεια"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Από��ιψη Breaking ^Holds"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -8087,136 +8042,136 @@ msgstr ""
 "Από��ιψη όλων των ενε�γειών που θα άλλαζαν την κατάσταση των σε αναμονή "
 "πακέτων ή θα εγκαθιστο�σαν αποαγο�ευμένες εκδόσεις."
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Ευ�εση"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Αναζήτηση π�ος τα εμπ�ός"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "^Αναζήτηση π�ος τα πίσω"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Αναζήτηση π�ος τα πίσω"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Β�ές ^Ξανά"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Επανάληψη της τελευταίας αναζήτησης"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Αναζήτηση και πάλι ^π�ος τα πίσω"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Επανάληψη της τελευταίας αναζήτησης στην αντίθετη κατε�θυνση"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Πε�ιό�ισε Εμφάνιση"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Εφα�μογή φίλτ�ου στον κατάλογο των πακέτων"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Εμφάνιση Χω�ίς Πε�ιο�ισμο�ς"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Αφαί�εση του φίλτ�ου από τον κατάλογο των πακέτων"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Β�ές Σ^πασμένο"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Β�ες το επόμενο πακέτο με ανεπίλυτες εξα�τήσεις"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Π�οτιμήσεις"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "Επιλογές ^Πε�ιβάλλοντος"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Αλλαγή των επιλογών που μεταβάλουν το πε�ιβάλλον ε�γασίας"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "Διαχεί�ιση Εξα�τήσεων"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Αλλαγή των �υθμίσεων που επη�εάζουν τη διαχεί�ιση των εξα�τήσεων των πακέτων"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Διάφο�α"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Αλλαγή διαφό�ων επιλογών του π�ογ�άμματος"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Επαναφο�ά επιλογών"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Ο�ισμός όλων των επιλογών στις π�οκαθο�ισμένες τιμές"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Επόμενο"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Εμφάνιση επόμενης οθόνης"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Π�οηγ"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Εμφάνιση π�οηγο�μενης οθόνης"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Κλείσιμο"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Κλείσιμο αυτής της οθόνης"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "^Π�οσθήκη κεντ�ικής όψης"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Δημιου�γία νέας οθόνης εμφάνισης πακέτου"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Εξέταση ^Συστάσεων"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -8224,87 +8179,87 @@ msgstr ""
 "Επίβλεψη πακέτων που συνίσταται να εγκατασταθο�ν, αλλά δεν είναι αυτή τη "
 "στιγμή εγκατεστημένα."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "�έα ^Απλή Λίστα Πακέτων"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Δείτε όλα τα πακέτα στο σ�στημα σε μια μοναδική χω�ίς κατηγο�ίες λίστα"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "�έός browser για ^Debtags"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Επιθεώ�ηση των πακέτων χ�ησιμοποιώντας τα δεδομένα του Debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Εμφάνιση �έας Κατηγο�ιοποίησης"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Εμφάνιση πακέτων ανά κατηγο�ία"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "Σχετικά"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Εμφάνιση πλη�οφο�ίας σχετικά με το π�όγ�αμμα"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Βοήθεια"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Εμφάνιση της βοήθειας του π�ογ�άμματος"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "Οδηγίες ^Χ�ήσης"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Εμφάνιση των αναλυτικών οδηγιών χ�ήσης"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^�έα"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Δείτε τις σημαντικές αλλαγές που έχουν γίνει σε κάθε έκδοση του"
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "Άδεια ^χ�ήσης"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Ενέ�γειες"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Επιλογές"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Οθόνες"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8313,11 +8268,11 @@ msgstr ""
 "%ls: Μενο� %ls: Βοήθεια %ls: Έξοδος %ls: Ενημέ�ωση %ls:Κατέβασμα/Εγκατάσταση/"
 "Αφαί�εση πακέτων"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "�"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "Ο"
 
@@ -8348,9 +8303,53 @@ msgstr "Διε�θυνση που θα χ�ησιμοποιηθεί για τη
 msgid "Downloading the changelog of %s"
 msgstr "Μεταφό�τωση Α�χείου Αλλαγών"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Μπο�είτε να εμφανίσετε ημε�ολόγια αλλαγών μόνο για επίσημα πακέτα."
+#~ msgid "MISSING TAG"
+#~ msgstr "ΕΤΙΚΕΤΤΑ ΠΟΥ ΛΕΙΠΕΙ"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr ""
+#~ "Διε�θυνση που θα χ�ησιμοποιηθεί για τη μεταφό�τωση των α�χείων αλλαγών"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Η επιλογή αυτή ελέγχει το υπόδειγμα που χ�ησιμοποιείται για το κατέβασμα "
+#~ "α�χείων αλλαγών (changelogs) από τον δικτυακό τόπο του Debian. Θα "
+#~ "χ�ειαστεί να το αλλάξετε μόνο αν τα α�χεία αλλαγών μετακινηθο�ν σε κάποιο "
+#~ "άλλο URL."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "το %s δεν είναι επίσημο πακέτο του Debian, δεν μπο�ώ να εμφανίσω το "
+#~ "ημε�ολόγιο αλλαγών του."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Δεν β�έθηκε πακέτο με όνομα \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Αδ�νατο το parse του π�οτ�που %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Πε�ίμενα έναν α�ιθμό μετά το -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Πε�ίμενα έναν α�ιθμό μετά το -q=, έλαβα %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o απαιτεί μια πα�άμετ�ο της μο�φής key=value, έλαβα %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "ΠΑΡΑΞΕ�Ο: ελήφθη άγνωστος κώδικας πα�άμετ�ου\n"
+
+#, fuzzy
+#~| msgid "-u and -i may not be specified with a command"
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "το -u και -i δεν μπο�ο�ν να ο�ιστο�ν στην ίδια εντολή"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Μπο�είτε να εμφανίσετε ημε�ολόγια αλλαγών μόνο για επίσημα πακέτα."
 
 #~ msgid "Err "
 #~ msgstr "Σφάλμα "
@@ -8532,11 +8531,6 @@ msgstr "Μπο�είτε να εμφανίσετε ημε�ολόγια αλλα
 #~ msgstr "Μεταφό�τωση Α�χείου Αλλαγών"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Δεν β�έθηκε λ�ση."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Αδ�νατο το άνοιγμα του α�χείου ιε�α�χίας πακέτων %s"
diff --git a/po/es.gmo b/po/es.gmo
index 070bf15d..1e0faadb 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index d2d8f80f..df1c8ea3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude 0.4.11\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:23+0800\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian-l10n-Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -388,24 +388,10 @@ msgstr ""
 "de un repositorio definido en el fichero «sources.list»."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL a usar para descargar los registros de cambios"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Esta opción controla la plantilla que se utilizará para descargar registros "
-"de cambios («changelogs») del sitio web de Debian. Sólo debería cambiar esta "
-"opción si cambia la URL de los registros de cambios."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Mostrar una previsualización de lo que se va a hacer antes de hacerlo"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -414,12 +400,12 @@ msgstr ""
 "activa esta opción, se le mostrará primero un resumen de las acciones que va "
 "a realizar."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Olvidar qué paquetes son «nuevos» al actualizar las listas de paquetes"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -427,12 +413,12 @@ msgstr ""
 "Aptitude limpiará la lista de los paquetes nuevos una vez actualice la lista "
 "de paquetes (p.ej. al pulsar «u») si habilita esta opción."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Olvidar qué paquetes son «nuevos» al instalar o eliminar paquetes"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -442,13 +428,13 @@ msgstr ""
 "después de llevar a cabo un proceso de instalación o de instalar o eliminar "
 "paquetes desde la línea de órdenes."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "No mostrar un aviso cuando el primer cambio se hace en modo sólo lectura"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -458,11 +444,11 @@ msgstr ""
 "a modificar el estado de un paquete si no tiene permisos para aplicar los "
 "cambios al sistema."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr "Avisar cuando se intente realizar una acción sin ser el administrador"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -475,11 +461,11 @@ msgstr ""
 "opción de acceder como usuario «root» y realizar las acciones con "
 "privilegios de administrador."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Fichero en el que registrar las acciones"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -492,13 +478,13 @@ msgstr ""
 "registro por la entrada estándar si el primer caracter es una tubería ('%B|"
 "%b')."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr ""
 "Resolver automáticamente las dependencias de un paquete cuando éste se "
 "seleccione"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -511,13 +497,13 @@ msgstr ""
 "dependencias incorporada en el programa, pero puede producir resultados "
 "inadecuados o fallar por completo en algunas situaciones."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Arreglar los paquetes rotos automáticamente antes de instalar o eliminar"
 
 # (jfs) TYPO: No space between «Otherwise, aptitude»
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -530,11 +516,11 @@ msgstr ""
 "hace, aptitude le preguntará qué solución desea para resolver las "
 "dependencias incumplidas."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Instalar los paquetes Recomendados de forma automática"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -552,11 +538,11 @@ msgstr ""
 "forma automática» no se eliminará de forma automática los paquetes "
 "recomendados por un paquete ya instalado."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Eliminar paquetes no usados automáticamente"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -574,11 +560,11 @@ msgstr ""
 "automáticamente», no se eliminarán los paquetes instalados automáticamente "
 "si existe algún paquete ya instalado que los recomiende."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Paquetes que nunca deberían eliminarse de forma automática"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -588,13 +574,13 @@ msgstr ""
 "como si algún paquetes instalado dependiera de ellos: nunca se les marcará "
 "para su eliminación como paquetes no utilizados."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Permitir la resolución de dependencias que rompe los paquetes bloquados o "
 "prohibidos"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -617,15 +603,15 @@ msgstr ""
 "dependencias de un paquete que se ha seleccionado para instalar o "
 "actualizar, debido a la errata de apt #470035."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Opciones de la IU"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Gestión de dependencias"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Miscelánea"
 
@@ -729,7 +715,7 @@ msgstr "No pudo encontrarse un archivo fuente para el paquete \"%s\".\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "No se pudieron satisfacer las dependencias de compilación: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -738,7 +724,7 @@ msgstr ""
 "Nota: \"%s\", que proporciona el paquete virtual\n"
 "      \"%s\", ya está instalado.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -747,7 +733,7 @@ msgstr ""
 "Nota: \"%s\", que proporciona el paquete virtual\n"
 "      \"%s\", ya va a ser instalado.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -756,17 +742,22 @@ msgstr ""
 "\"%s\" existe en la base de datos de paquetes, pero no es un paquete real y\n"
 "ningún paquete lo proporciona.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" es un paquete virtual proporcionado por:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Debe elegir uno para instalar.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "El paquete «%s» no tiene un candidato para la instalación"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -775,67 +766,59 @@ msgstr ""
 "Nota: seleccionando \"%s\" en vez de\n"
 "      el paquete virtual \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s ya está instalado en la versión solicitada (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 #| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s no está instalado actualmente, luego no se reinstala.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 #| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s ya está instalado en la versión solicitada (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s no está instalado actualmente, luego no se reinstala.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "El paquete %s no está instalado, luego no se elimina\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "El paquete %s no está instalado, no se puede prohibir una actualización\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "El paquete %s no es actualizable, no se puede prohibir una actualización\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Nota: seleccionando la tarea \"%s: %s\" para la instalación\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Sólo puede especificar una versión de un paquete con una orden «install» o "
-"«forbid-version».\n"
+"«forbid-version»"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr ""
-"Sólo puede especificar un archivo de un paquete con la orden «install».\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Sólo puede especificar un archivo de un paquete con la orden «install»"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -844,7 +827,7 @@ msgstr ""
 "No se puede encontrar el paquete \"%s\", y su nombre\n"
 "\"%s\" se encuentra en más de 40 paquetes.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -853,14 +836,14 @@ msgstr ""
 "No se puede encontrar el paquete \"%s\". Sin embargo, los siguientes\n"
 "paquetes contienen \"%s\" en su nombre:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "No se puede encontrar ningún paquete cuyo nombre o descripción coincida con "
 "\"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -878,7 +861,7 @@ msgstr ""
 "No se puede encontrar ningún paquete que coincida con \"%s\". Sin embargo,\n"
 "los siguiente paquetes contienen \"%s\" en su descripción:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Carácter de acción «%c» incorrecto\n"
@@ -903,7 +886,7 @@ msgstr "Err "
 msgid "Changelog download failed: %s"
 msgstr "Registro de cambios de %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "No se puede ejecutar sensible-pager, ¿es éste un sistema Debian que funciona "
@@ -911,34 +894,26 @@ msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s no es un paquete de Debian oficial, no se puede mostrar el registro de "
-"cambios."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "No se puede encontrar el registro de cambios para %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 #| msgid "Couldn't find a changelog for %s"
 msgid "Couldn't run pager %s"
 msgstr "No se puede encontrar el registro de cambios para %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: La orden «clean» no toma argumentos\n"
+msgid "The clean command takes no arguments"
+msgstr "La orden «clean» no toma argumentos"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Borra %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 #| msgid "Unable to look up your home directory, saving to /tmp/function_pkgs!"
 msgid "Unable to lock the download directory"
@@ -946,65 +921,56 @@ msgstr ""
 "No se pudo encontrar su directorio personal, ¡guardando en «/tmp/"
 "function_pkgs»!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Borra %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: La orden «autoclean» no toma argumentos\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "La orden «autoclean» no toma argumentos"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Se liberará %sB de espacio de disco\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Se liberará %sB de espacio de disco\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operación %s inválida"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Patrón de argumento inesperado después de \"keep-all\""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "Incapaz de resolver las dependencias, intente la ejecución con «--full-"
-"resolver».\n"
+"resolver»"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Cancela.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "descarga: debe especificar al menos un paquete para descargar\n"
+msgid "download: you must specify at least one package to download"
+msgstr "descarga: debe especificar al menos un paquete para descargar"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "No se pudo leer la lista de fuentes"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "No se puede encontrar ningún paquete con el nombre \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1047,22 +1013,14 @@ msgid "[Working]"
 msgstr "[Trabajando]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: es necesario al menos un argumento (el directorio\n"
-"en el que escribir los ficheros).\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "El paquete «%s» no existe"
+"extract-cache-entries: es necesario al menos un argumento (el directorio en "
+"el que escribir los ficheros)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
@@ -1070,11 +1028,10 @@ msgstr ""
 "nada que hacer.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: La orden «forget-new» no toma argumentos\n"
+msgid "The forget-new command takes no arguments"
+msgstr "La orden «forget-new» no toma argumentos"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Olvidaría que paquetes son nuevos\n"
@@ -1187,17 +1144,17 @@ msgstr ""
 "Se configurarán los siguientes paquetes que están ahora parcialmente "
 "instalados:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "¡Se ELIMINAR�N los siguientes paquetes ESENCIALES!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Esta acción ROMPER� los siguientes paquetes ESENCIALES:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1206,16 +1163,16 @@ msgstr ""
 "AVISO: ¡Esta acción probablemente romperá su sistema!<\n"
 "       ¡NO continúe a menos que sepa EXACTAMENTE lo que hace!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Sí, sé que es una idea muy mala"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Para continuar, teclee la frase \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1233,7 +1190,7 @@ msgstr ""
 "que quiere.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1242,7 +1199,7 @@ msgstr ""
 "*** AVISO ***   ¡Ignorando las firmas incorrecta porque\n"
 "                %s::CmdLine::Ignore-Trust-Violations es «true»!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1255,7 +1212,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr "Seguir e ignorar el aviso|Si"
 
@@ -1264,100 +1221,100 @@ msgstr "Seguir e ignorar el aviso|Si"
 #. 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr "Abortar en lugar de obviar el aviso|No"
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "¿Quiere ignorar este aviso y continuar de todos modos?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Para continuar, introduzca \"%s\"; para abortar, introduzca \"%s\":"
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Entrada irreconocible. Introduzca \"%s\" o \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Se RECOMIENDAN los siguientes paquetes, pero NO se instalarán:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Se SUGIEREN los siguientes paquetes, pero NO se instalarán:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "No se instalará, actualizará o eliminará ningún paquete.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paquetes actualizados, %lu nuevos instalados, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualizados, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu para eliminar y %lu sin actualizar.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Necesito descargar %sB/%sB de ficheros. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Necesito descargar %sB de ficheros. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Después de desempaquetar se usarán %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Después de desempaquetar se liberarán %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Ningún paquete a mostrar -- introduzca los nombres de los paquetes en la "
 "línea después de «i».\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Presione Enter para continuar."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Ningún paquete encontrado -- introduzca los nombres de los paquetes en la "
 "línea después de «c».\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1366,30 +1323,30 @@ msgstr ""
 "No se encontró ningún paquete: introduzca cero o más raíces para la búsqueda "
 "seguidos del paquete a justificar.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "continuar con la instalación"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr " cancelar y salir"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1397,12 +1354,12 @@ msgstr ""
 "mostrar información acerca de uno o más paquetes. Los paquetes deben seguir "
 "a la «i»"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1410,40 +1367,40 @@ msgstr ""
 "mostrar los registros de cambios de uno o más paquetes. Los paquetes deben "
 "seguir a la «c»"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "activar/desactivar la información de dependencias"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr ""
 "activar/desactivar la información sobre el cambio de tamaño de los paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "activar/desactivar la información sobre las versiones"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1452,27 +1409,27 @@ msgstr ""
 "explicar porque la instalación de un paquete lleva a la instalación de otro "
 "distinto."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "ejecutar el programa de resolución automática de dependencias para arreglar "
 "las depedencias incumplidas."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "usar la interfaz visual"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1484,47 +1441,47 @@ msgstr ""
 "nombres de paquetes (o patrones). La acción se aplicará a todos los paquetes "
 "que ponga. Las siguientes acciones están disponibles:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "«+» para instalar paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "«+M» para instalar paquetes y marcarlos inmediatamente como instalados "
 "automáticamente"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "«-» para eliminar"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "«_» para purgar los paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "«=» para bloquear paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "«:» para mantener paquetes en su estado actual sin bloquearlos"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "«&M» para marcar paquetes como instalados automáticamente"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "«&m» para marcar paquetes como instalados manualmente"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "'&BD' para instalar las depedencias para construir un paquete."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1532,30 +1489,30 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 #| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "«&M» para marcar paquetes como instalados automáticamente"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Órdenes:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1563,22 +1520,22 @@ msgstr ""
 "aptitude no pudo encontrar una solución a estas dependencias. Puede "
 "solucionar estas dependencias manualmente o pulsar «n» para salir."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "¿Quiere continuar? [Y/n/?] "
 
 # (jfs) TYPO? (blank space at EOL)
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "¿Desea resolver las depedencias manualmente? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Respuesta inválida. Por favor, introduzca una orden válida o «?» para leer "
 "la ayuda.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1587,7 +1544,7 @@ msgstr ""
 "un paquete), «R» para la resolución automática de dependencias o «N» para "
 "salir."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1598,7 +1555,7 @@ msgstr ""
 "Se mostrará la información de dependencias.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1609,7 +1566,7 @@ msgstr ""
 "No se mostrará la información de dependencias.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1620,7 +1577,7 @@ msgstr ""
 "Se mostrarán las versiones.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1631,7 +1588,7 @@ msgstr ""
 "No se mostrarán la versiones.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1642,7 +1599,7 @@ msgstr ""
 "Se mostrarán los tamaños de los cambios.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1791,6 +1748,11 @@ msgstr ""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Se esperaba una versión o «%s» después de «%s»"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "El paquete «%s» no existe"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1947,7 +1909,7 @@ msgstr ""
 "Quiero resolver las dependencias, pero no se creó un programa de resolución "
 "de dependencias."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1977,7 +1939,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Las siguientes órdenes están disponibles:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Fichero en el que escribir el estado del solucionador:"
 
@@ -2013,7 +1975,7 @@ msgstr ""
 "           Puede seguir buscando pero no podrá llegarse a algunas\n"
 "           excepciones."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -2022,7 +1984,7 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 #| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
@@ -2030,21 +1992,20 @@ msgstr ""
 "Incapaz de resolver las dependencias para la actualización (no se encontró "
 "una solución)."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 #| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Incapaz de resolver las dependencias para la actualización (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "falló iconv sobre %s.\n"
+msgid "iconv of %s failed"
+msgstr "falló iconv sobre %s"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "búsqueda: Debe proporcionar al menos una término de búsqueda\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "búsqueda: Debe proporcionar al menos una término de búsqueda"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2087,7 +2048,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "No se satisfacen las dependencias de los siguientes paquetes:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2310,7 +2271,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Proporciona"
 
@@ -2324,15 +2285,9 @@ msgstr "Descripción: "
 msgid "Homepage: "
 msgstr "Página principal: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "No se pudo localizar el paquete %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "No se pudo interpretar el patrón %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "No se encontró ningún paquete"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2343,14 +2298,13 @@ msgstr "Descargará/instalará/eliminará paquetes.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Error interno, la ordenación no terminó"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Borrando los ficheros descargados ya obsoletos"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: La orden «update» no toma argumentos\n"
+msgid "The update command takes no arguments"
+msgstr "La orden «update» no toma argumentos"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2369,139 +2323,159 @@ msgstr ""
 "%s: muy pocos argumentos, se esperaba por lo menos un nombre de marca y un "
 "paquete.\n"
 
-#: src/cmdline/cmdline_util.cc:167
-#, c-format
-msgid "No candidate version found for %s\n"
-msgstr "No se encontró ninguna versión candidata para %s\n"
-
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "No se encontró ninguna versión reciente o candidata para %s\n"
+msgid "No candidate version found for %s"
+msgstr "No se encontró ninguna versión candidata para %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Incapaz de encontrar un archivo \"%s\" para el paquete \"%s\"\n"
+msgid "No current or candidate version found for %s"
+msgstr "No se encontró ninguna versión reciente o candidata para %s"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Incapaz de encontrar una versión \"%s\" para el paquete \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Incapaz de encontrar un archivo \"%s\" para el paquete \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr ""
-"¡Error interno: se ha pasado a cmdline_find_ver un valor inválido %i!\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Incapaz de encontrar una versión \"%s\" para el paquete \"%s\""
 
-#: src/cmdline/cmdline_util.cc:239
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr ""
-"No puede especificar un archivo y una versión para un paquete a la vez\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "¡Error interno: se ha pasado a cmdline_find_ver un valor inválido %i!"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't find a changelog for %s"
-msgid "Couldn't find task '%s'"
-msgstr "No se puede encontrar el registro de cambios para %s"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "No puede especificar un archivo y una versión para un paquete a la vez"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d roto [%+d]"
 msgstr[1] "%d rotos [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d actualizado [%+d]"
 msgstr[1] "%d actualizados [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d nuevo [%+d]"
 msgstr[1] "%d nuevos [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Estado actual: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "Hay %d paquete nuevo obsoleto."
 msgstr[1] "Hay %d paquetes nuevos obsoletos."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "Hay %d paquete nuevo obsoleto:"
 msgstr[1] "Hay %d paquetes nuevos obsoletos:"
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "No hay una coma después del nombre de marca siguente «%s»"
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "No se pudo localizar el paquete %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find task '%s'"
+msgstr "No se puede encontrar el registro de cambios para %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Nota: seleccionando la tarea \"%s: %s\" para la instalación\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "No se puede encontrar el registro de cambios para %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 #| msgid "Packages"
 msgid "Package %s:"
 msgstr "Paquetes"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 #| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Paquete fuente: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 #| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archivo"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
 #| msgid "search: You must provide at least one search term\n"
-msgid "versions: You must provide at least one package selector\n"
+msgid "versions: You must provide at least one package selector"
 msgstr "búsqueda: Debe proporcionar al menos una término de búsqueda\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2524,7 +2498,7 @@ msgstr "Actual"
 msgid "Candidate"
 msgstr "Candidato"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Instalar"
 
@@ -2627,22 +2601,19 @@ msgstr "No se pudo encontrar una razón para instalar %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Paquetes que dependen de %s:"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "No existe ningún paquete con el nombre «%s»."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "No se pudo interpretar algunos patrón de comparación."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
-msgstr ""
-"%s: esta orden necesita al menos un argumento (el paquete a consultar).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
+msgstr "%s: esta orden necesita al menos un argumento (el paquete a consultar)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2669,11 +2640,11 @@ msgstr "INSATISFECHO"
 msgid "UNAVAILABLE"
 msgstr "NO DISPONIBLE"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Marcas"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Marcas de usuario"
 
@@ -2889,33 +2860,33 @@ msgstr ""
 "sólo lectura, ¡se PERDER�N todos los cambios que realice al estado de los "
 "paquetes!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 #| msgid "allow_choices"
 msgid "allowed"
 msgstr "permitir_opciones"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "principal"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2982,36 +2953,44 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "No está disponible el almacén de paquetes. No se puede descargar e instalar "
 "los paquetes."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Error interno: no se pudo generar la lista de paquetes a descargar"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Se produjo un fallo al descargar %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"No se pudieron obtener algunos archivos, ¿quizás deba ejecutar «aptitude "
+"update» o deba intentarlo de nuevo con --fix-missing?"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Incapaz de corregir los paquetes no disponibles"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Un paquete no se pudo instalar. Intentado recuperarse:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3163,13 +3142,13 @@ msgstr ""
 "\n"
 "Registro completado.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 #| msgid "Downloading packages"
 msgid "Filtering packages"
@@ -3288,19 +3267,19 @@ msgstr ""
 "Los ficheros con los índices de paquetes están dañados. No hay un campo\n"
 "Filename: para el paquete %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Registro de cambios de %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 #| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: %s"
 msgstr "Fallo al descargar el registro de cambios: %s"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 #| msgid "Failed to download the changelog: %s"
 msgid "Failed to download changelogs: unexpected exception."
@@ -3352,28 +3331,29 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "No se pudo interpretar el patrón %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Construir la base de datos de etiquetas"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 #| msgid "No upgrades are available."
 msgid "No tag descriptions are available."
 msgstr "No hay actualizaciones disponibles."
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 #| msgid "No upgrades are available."
 msgid "No description available for %s."
 msgstr "No hay actualizaciones disponibles."
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3538,43 +3518,43 @@ msgstr "Gestor de Paquetes Aptitude"
 msgid "_File"
 msgstr "Falso"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Realizar todas las instalaciones y eliminaciones pendientes"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Buscar nuevas versiones de los paquetes"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Marcar todos los paquetes actualizables que no están retenidos para que sean "
 "actualizados"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Olvidar que paquetes son «nuevos»"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Cancelar todas las instalaciones, eliminaciones, bloqueos y actualizaciones "
 "pendientes."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Borra los ficheros de paquetes descargados previamente"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Borra los ficheros de paquetes que ya no pueden ser descargados"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Recarga el almacén de paquetes"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3584,7 +3564,7 @@ msgstr ""
 "Ejecuta «su» para convertirse en administrador. Esto reiniciará el programa "
 "pero se mantendrán sus preferencias."
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Salir del programa"
 
@@ -3592,7 +3572,7 @@ msgstr "Salir del programa"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Deshacer la última operación o grupo de operaciones sobre los paquetes"
 
@@ -3630,7 +3610,7 @@ msgid "_Help"
 msgstr "Ayuda"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3638,19 +3618,19 @@ msgstr ""
 msgid "Update"
 msgstr "Actualizar"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Paquetes"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Solucionador"
 
@@ -3827,7 +3807,7 @@ msgid "Fix Manually"
 msgstr "Arreglar manualmente"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Actualizar"
 
@@ -4367,11 +4347,11 @@ msgstr "Instalado"
 msgid "Reinstall"
 msgstr "Reinstalar"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Desactualizar"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -4403,7 +4383,7 @@ msgstr "Solo el administrador puede actualizar las listas."
 msgid "Download already running."
 msgstr "Descarga en curso."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Ya está teniendo lugar una actualización de la lista de paquetes o una "
@@ -4470,41 +4450,41 @@ msgstr "Error en el paquete %s"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Preguntando si reemplazar el archivo de configuración %s"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Descargando paquetes"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr "Mostrar paquetes rotos"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr "Resolver las dependencias"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "El paquete %d está roto."
 msgstr[1] "Los paquetes %d están rotos."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr "Ver cambios"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr "Aplicar cambios"
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 #| msgid "%d install"
 #| msgid_plural "%d installs"
@@ -4516,7 +4496,7 @@ msgstr[1] "%d instalación"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 #| msgid "failed to remove %s"
 msgid "%d package to remove"
@@ -4524,55 +4504,55 @@ msgid_plural "%d packages to remove"
 msgstr[0] "No se pudo eliminar %s"
 msgstr[1] "No se pudo eliminar %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr "TamDescarga: %sB."
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr "Ésta capacidad no está implementada, por ahora."
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr "No implementado"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr "Instalar/Actualizar"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr "Purgar"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Mantener"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Retener"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 #| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Manual de usuario"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr "Conmutar estado automático"
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4609,7 +4589,7 @@ msgstr "no"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4653,15 +4633,15 @@ msgstr "%s; se esta instalando manualmente."
 msgid "Cache reloading, please wait..."
 msgstr "Cargando almacén espere por favor..."
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr "Buscando..."
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr "Construyendo la vista"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Construyendo la vista"
@@ -5401,115 +5381,116 @@ msgstr "Tipo de alineamiento desconocido «%s»"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 #| msgid "By-name sorting policies take no arguments"
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Las normas de ordenación por nombre no toman argumentos"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Nombre de norma de ordenación de longitud cero inválido"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "«(» sin cerrar en la descripción de la norma de ordenación"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Tipo de norma de ordenación inválida: «%s»"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "No se puede decodificar la cadena multibyte después de \"%ls\""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 "No se puede decodificar la cadena de carcacteres anchos después de \"%s\""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilado en %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilador: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Compilado con:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr " versión apt %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr " Versión de NCurses: Desconocida\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr " Versión de NCurses: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr " Versión de libsigc++: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Activado el soporte de Ept.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Desactivado el soporte de Ept.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 #| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr " versión apt %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 #| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr " versión apt %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Desactivado el soporte de Ept.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 #| msgid "%s %s compiled at %s %s\n"
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s compilado en %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Qt support disabled.\n"
 msgstr "  Desactivado el soporte de Ept.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5517,32 +5498,32 @@ msgstr ""
 "\n"
 "Versiones de librerias actuales:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr " Versión de NCurses: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr " Versión de cwidget: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr " Versión de Apt: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Modo de uso: aptitude [-S nombre_fichero] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opciones] <acción> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5552,43 +5533,43 @@ msgstr ""
 "interactivo):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      -  Instala/actualiza paquetes.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       -  Elimina paquetes.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge        - Elimina paquetes junto con sus ficheros de configuración.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Bloquea paquetes.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Desbloquea un paquete.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Marca paquetes como instalados manualmente.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Desmarca paquetes como instalados manualmente.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5597,18 +5578,18 @@ msgstr ""
 " forbid-version - prohíbe a aptitude actualizar a una versión específica de "
 "un paquete.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr ""
 " update       - Descarga las listas de paquetes nuevos/actualizables.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Realiza una actualización segura.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5617,55 +5598,55 @@ msgstr ""
 " full-upgrade - Realiza una actualización, posiblemente instalando\n"
 "                y eliminando paquetes.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 #| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' para instalar las depedencias para construir un paquete."
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Olvida qué paquetes son \"nuevos\".\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Busca un paquete por nombre y/o expresión.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Muestra información detallada de un paquete.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - muestra información detallada de un paquete\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Elimina los ficheros de paquetes descargados.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr ""
 " autoclean    - Elimina los ficheros de paquetes descargados obsoletos.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Muestra el registro de cambios del paquete.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Descarga los ficheros .deb para un paquete.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5674,7 +5655,7 @@ msgstr ""
 " reinstall    - Descarga y (posiblemente) reinstala un paquete ya "
 "instalado.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5686,7 +5667,7 @@ msgstr ""
 "               o por qué uno de los paquetes necesita un paquete concreto.\n"
 "\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5700,17 +5681,17 @@ msgstr ""
 "                uno o más paquetes llevarían a un conflicto con dicho "
 "paquete.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opciones:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr "-h              Este texto de ayuda.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
@@ -5718,18 +5699,18 @@ msgstr ""
 " --gui          use la interfaz GTK aunque esté desactivada en la "
 "configuración.\n"
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr " --no-gui          No use la interfaz GTK aunque este disponible.\n"
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " --qt           Use the Qt GUI.\n"
 msgstr "-h              Este texto de ayuda\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, fuzzy, c-format
 #| msgid ""
 #| " --gui          Use the GTK GUI even if disabled in the configuration.\n"
@@ -5739,25 +5720,25 @@ msgstr ""
 " --gui          use la interfaz GTK aunque esté desactivada en la "
 "configuración.\n"
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 "-s              Simula las acciones, pero en realidad no las realiza.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 "-d              Sólo descarga paquetes, no instala o desinstala nada.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr "-p              Siempre pide confirmación de las acciones.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5765,7 +5746,7 @@ msgstr ""
 "-y              Supone que la respuesta a preguntas simples del tipo sí/no "
 "es «sí».\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5774,7 +5755,7 @@ msgstr ""
 "-F formato      Especifica el formato para mostrar los resultados de las\n"
 "                búsquedas, lea el manual.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5784,7 +5765,7 @@ msgstr ""
 "búsqueda,\n"
 "                lea el manual.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
@@ -5793,17 +5774,17 @@ msgstr ""
 "resultado\n"
 "                de la búsqueda.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr "-f              Trata de arreglar paquetes rotos de forma agresiva.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr "-V              Muestra la versión de los paquetes a instalar.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -5811,12 +5792,12 @@ msgstr ""
 "-D              Muestra las dependencias de los paquetes cambiados "
 "automáticamente.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr "-Z\t\t    Muestra el cambio del tamaño instalado de cada paquete.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5824,7 +5805,7 @@ msgid ""
 msgstr ""
 "-v              Muestra información extra (puede darse más de una vez).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
@@ -5832,7 +5813,7 @@ msgstr ""
 "-t [distrib]    Establece la distribución desde la que se instalan los "
 "paquetes.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5841,14 +5822,14 @@ msgstr ""
 " -q             No muestra los indicadores de progreso incrementales \n"
 "                en el modo de línea de órdenes.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o opconf=val     Establecer directamente la opción de configuración "
 "llamada «opconf».\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5857,35 +5838,35 @@ msgstr ""
 " --with(out)-recommends,\tEspecifica si se tratan o no las\n"
 "                recomendaciones como dependencias fuertes.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 "-S fnombre: lee la información de estado extendida de aptitude de fnombre.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr "-u       : Descarga una nueva lista de paquetes al arrancar.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr "-h              Este texto de ayuda\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr "-i       : Realiza una instalación al arrancar.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Este aptitude no tiene poderes de Super Vaca.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 #| msgid "true"
 msgid "trace"
@@ -5893,13 +5874,13 @@ msgstr "verdadero"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 #| msgid "no"
 msgid "info"
@@ -5907,113 +5888,93 @@ msgstr "no"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 msgid "warn"
 msgstr "avisar"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:405
+#: src/main.cc:371
 msgid "error"
 msgstr "error"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 msgid "fatal"
 msgstr "fatal"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
 #| msgid "Invalid operation %s"
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Operación %s inválida"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Se esperaba una número después de -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Se esperaba un número después de -q=, se obtuvo %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o requiere un argumento de la forma opción=valor, se proporcionó %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "No hay una coma después del nombre de marca siguente «%s».\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "RAREZA: recibido código de opción desconocido\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 #| msgid "Package"
 msgid "first-package"
 msgstr "Paquete"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 #| msgid "All Packages"
 msgid "all-packages"
 msgstr "Todos los paquetes"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -6021,42 +5982,36 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 #| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "No se puede especificar -u y -i a la vez\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 #| msgid ""
 #| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u e -i puede que no deban especificarse en la línea de órdenes (p.ej., con "
 "«install»)"
 
-#: src/main.cc:1105
-#, fuzzy
-#| msgid "-u and -i may not be specified with a command"
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u e -i puede que no deban especificarse con una orden"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Orden desconocida \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Orden desconocida \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Excepción no gestionada: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -6074,7 +6029,7 @@ msgstr "Buscar:"
 msgid "Search backwards for: "
 msgstr "Buscar hacia atrás: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Buscaminas"
 
@@ -6290,7 +6245,7 @@ msgstr "Codificación de mine-help-es.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Paquete"
 
@@ -6371,8 +6326,8 @@ msgstr "<N/A>"
 msgid "<none>"
 msgstr "<ninguno>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtual"
@@ -6508,7 +6463,7 @@ msgstr ""
 msgid "Internal error: Default column string is unparsable"
 msgstr "Error interno: la columna por defecto es ininteligible"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Tareas"
 
@@ -6669,11 +6624,11 @@ msgstr ""
 "El índice de coincidencia %ls es demasiado largo; los grupos disponibles son "
 "(%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PAQUETES SIN MARCAS"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6684,10 +6639,6 @@ msgstr ""
 "de «debtags» no está disponible (puede resolver este problema instalando "
 "«debtags»)"
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "MARCA NO ENCONTRADA"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Paquete fuente: "
@@ -7325,7 +7276,7 @@ msgstr "Cargando almacén"
 msgid "Really quit Aptitude?"
 msgstr "¿Salir de Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Cambiar el comportamiento de aptitude"
 
@@ -7407,7 +7358,7 @@ msgstr ""
 msgid "License"
 msgstr "Licencia"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Consultar los términos bajo los que puede copiar y distribuir aptitude"
 
@@ -7428,7 +7379,7 @@ msgstr "Ayuda en línea"
 msgid "View a brief introduction to aptitude"
 msgstr "Consulte una breve introducción a aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Ayuda"
 
@@ -7457,7 +7408,7 @@ msgstr "Manual"
 msgid "FAQ"
 msgstr "PUF"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Ver una lista de preguntas frecuentes"
 
@@ -7500,15 +7451,15 @@ msgstr ""
 "eliminen este directorio y todos sus contenidos? No verá este mensaje de "
 "nuevo si elige «No»."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Ver el progreso de la descarga de los paquetes"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Descarga de paquetes"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7521,35 +7472,35 @@ msgstr ""
 "Sólo debe continuar la instalación si está seguro de que es lo que quiere.%n"
 "%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versión %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Continúa de todas formas"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Aborta la instalación"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Pre-visualización de la instalación de los paquetes"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Ver y/o ajustar las acciones que se realizarán"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Algunos paquetes estaban rotos y se han arreglado:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "¡No existe ninguna solución para estos problemas de dependencias!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7558,7 +7509,7 @@ msgstr ""
 "Se agotó el tiempo tratando de resolver las dependencias (presione \"%s\" "
 "para intentarlo concienzudamente)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7567,20 +7518,20 @@ msgstr ""
 "administración, que actualmente no tiene. ¿Desearía cambiar a la cuenta de "
 "administrador?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Convertirse en administrador"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "No convertirse en administrador"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "No hay ningún paquete planificado para instalar, eliminar o actualizar."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7590,19 +7541,19 @@ msgstr ""
 "pueden actualizarse, pero ha elegido no actualizarlos. Escriba \"U\" para "
 "preparar una actualización."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Actualizando la lista de paquetes"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Ver el progreso de la actualización de la lista de paquetes"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Actualizando listas"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7611,23 +7562,23 @@ msgstr ""
 "administración, que actualmente no tiene. ¿Desearía cambiar a la cuenta de "
 "administrador?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Pierda su tiempo intentando buscar las minas"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "No está permitido limpiar mientras se esté realizando una descarga"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Eliminando ficheros descargados"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Se han borrado los ficheros de paquetes descargados"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7640,13 +7591,13 @@ msgstr ""
 "administración, que actualmente no tiene. ¿Desearía cambiar a la cuenta de "
 "administrador?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 "El almacén de paquetes de apt no está disponible, no se podrá limpiar "
 "automáticamente."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7655,7 +7606,7 @@ msgstr ""
 "Se han borrado los ficheros de paquetes descargados obsoletos, liberando %sB "
 "de espacio en disco."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7668,123 +7619,123 @@ msgstr ""
 "administración, que actualmente no tiene. ¿Desearía cambiar a la cuenta de "
 "administrador?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "No hay más soluciones"
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "No se pudo encontrar una solución aplicable."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Se agotó el tiempo al intentar buscar una solución."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Resolver las dependencias"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Buscar soluciones para las dependencias sin resolver"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "No se pudo abrir %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Error las volcar el estado del solucionador"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Instalar/eliminar paquetes"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Actualizar la lista de paquetes"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Marcar ^actualizable"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Olvidar paquetes nuevos"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Cance^lar acciones pendientes"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Limpiar el almacén de paquetes"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Limpiar ficheros ^obsoletos"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Recargar el almacén de paquetes"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Jugar al buscaminas"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^Convertirse en administrador"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Salir"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Deshacer"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Marcar el paquete seleccionado actualmente para instalar o actualizar"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Eliminar"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Marcar el paquete seleccionado actualmente para eliminar"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Purgar"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Marcar el paquete seleccionado actualmente y sus ficheros de configuración "
 "para eliminar"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Mantener"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Cancelar cualquier acción en el paquete seleccionado"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Retener"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7792,11 +7743,11 @@ msgstr ""
 "Cancelar cualquier acción en el paquete seleccionado, y protejerlo de "
 "futuras actualizaciones"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Marcar ^automático"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7804,11 +7755,11 @@ msgstr ""
 "Marcar el paquete seleccionado como instalado automáticamente. Se eliminará "
 "automáticamente si ningún otro paquete depende de él"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Marcar ^manual"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7816,11 +7767,11 @@ msgstr ""
 "Marcar el paquete seleccionado como instalado manualmente. No se eliminará a "
 "menos que lo haga manualmente"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Prohíbir versiones"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7828,19 +7779,19 @@ msgstr ""
 "Evitar que se instale la versión candidata del paquete seleccionado. Las "
 "versiones posteriores del paquete se instalaran de la forma usual"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "^Información"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Mostrar más información acerca del paquete seleccionado"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "Rec^orrer información de paquetes"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7850,59 +7801,59 @@ msgstr ""
 "descripción larga del paquete, un resumen de su estado de dependencias o un "
 "análisis de por qué se necesita el paquete."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Registro de cambios"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Mostrar el registro de cambios del paquete seleccionado"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Examinar solución"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Examinar los problemas de dependencias de la solución seleccionada."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Aplicar ^Solución"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Realizar las acciones de la solución seleccionada."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Solución siguiente"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Seleccionar la siguiente solución a los problemas de dependencias."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^Solución anterior"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Seleccionar la solución anterior a los problemas de dependencias."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^Primera solución"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Seleccionar la primera solución a los problemas de dependencias."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "^Ultima solución"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7910,35 +7861,35 @@ msgstr ""
 "Seleccionar la última solución a los problemas de dependencias que se han "
 "generado hasta ahora."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Conmutar ^Rechazados"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Conmutar entre rechazar o no la acción seleccionada."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Conmutar ^Aceptada"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Conmutar entre aceptar o no la acción seleccionada."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Ver objetivo"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Ver el paquete que será afectado por la acción seleccionada"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Rechazar romper ^bloqueos"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7946,224 +7897,224 @@ msgstr ""
 "Rechazar todas las acciones que cambiarían el estado de un paquete bloqueado "
 "o que instalarían versiones prohibidas."
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Buscar"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Buscar hacia adelante"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "^Buscar hacia atrás"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Buscar hacia atrás"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Buscar otra ^Vez"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Repetir la última búsqueda"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Buscar de nuevo hacia ^atrás"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Repetir la última búsqueda en la dirección opuesta"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Limitar vista"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Aplicar un filtro a la lista de paquetes"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^No limitar vista"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Eliminar el filtro de la lista de paquetes"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Buscar ^Roto"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Encontrar el siguiente paquete con dependencias insatisfechas"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Preferencias"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "Opciones de la ^IU"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Cambiar las preferencias que afectan a la interfaz de usuario"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "Manejo de ^dependencias"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Cambiar las preferencias que afectan como se gestionan las dependencias de "
 "paquetes"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Miscelánea"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Cambiar diversas preferencias del programa"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Deshacer opciones"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Fijar todas las preferencias en los valores predeterminados"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Siguiente"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Ver siguiente pantalla"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Prev"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Ver pantalla anterior"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Cierra"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Cerrar esta pantalla"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Nueva ^vista de paquetes"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Crear una nueva vista de paquetes por defecto"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Auditar ^Recomendaciones"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr ""
 "Mostrar los paquetes que se recomienda instalar pero que no estén instalados."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Nueva ^vista de paquetes plana"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Mostrar los paquetes del sistema en una única lista sin categorías"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Nuevo ^navegador debtags"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Buscar paquetes usando los datos de debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Nuevo ^navegador de categorías"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Navegar paquetes por categorías"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Acerca de"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Ver información sobre este programa"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Ayuda"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Ver la ayuda en línea"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Manual de usuario"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Consultar el manual detallado del programa"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^PUF"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Noticias"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Ver los cambios más importantes realizados en cada versión de "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licencia"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Acciones"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Buscar"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Opciones"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Vistas"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8172,11 +8123,11 @@ msgstr ""
 "%ls: Menú %ls: Ayuda %ls: Salir %ls: Actualizar %ls: Descarga/Instala/"
 "Elimina Paqs"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "s"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -8207,9 +8158,53 @@ msgstr "Fallo al descargar el registro de cambios: %s"
 msgid "Downloading the changelog of %s"
 msgstr "Descargando registro de cambios"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Sólo puede ver registros de cambios de paquetes de Debian oficiales."
+#~ msgid "MISSING TAG"
+#~ msgstr "MARCA NO ENCONTRADA"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL a usar para descargar los registros de cambios"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Esta opción controla la plantilla que se utilizará para descargar "
+#~ "registros de cambios («changelogs») del sitio web de Debian. Sólo debería "
+#~ "cambiar esta opción si cambia la URL de los registros de cambios."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s no es un paquete de Debian oficial, no se puede mostrar el registro de "
+#~ "cambios."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "No se puede encontrar ningún paquete con el nombre \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "No se pudo interpretar el patrón %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Se esperaba una número después de -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Se esperaba un número después de -q=, se obtuvo %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr ""
+#~ "-o requiere un argumento de la forma opción=valor, se proporcionó %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "RAREZA: recibido código de opción desconocido\n"
+
+#, fuzzy
+#~| msgid "-u and -i may not be specified with a command"
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u e -i puede que no deban especificarse con una orden"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr ""
+#~ "Sólo puede ver registros de cambios de paquetes de Debian oficiales."
 
 #~ msgid "Err "
 #~ msgstr "Err "
@@ -8383,11 +8378,6 @@ msgstr "Sólo puede ver registros de cambios de paquetes de Debian oficiales."
 #~ msgstr "Descargando registro de cambios"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "No se encontró ninguna solución."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "No se puede abrir el fichero con la jerarquía de paquetes %s"
diff --git a/po/eu.gmo b/po/eu.gmo
index 755af406..6f8812ff 100644
--- a/po/eu.gmo
+++ b/po/eu.gmo
diff --git a/po/eu.po b/po/eu.po
index 103662c2..af5ffd66 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude_po_eu\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:23+0800\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -372,24 +372,10 @@ msgstr ""
 "pakete ezabatuko du."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "Aldaketen egunkariak deskargatzeko erabiliko den URLa"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Aukera honek Debian webgunetik aldaketa-erregistroak nola deskargatuko diren "
-"kontrolatzen du.  Aldaketa erregistroak URL ezberdin batetara mugitzen "
-"badira bakarrik aldatu beharko zenuke."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Egin aurretik, erakutsi zer egingo den"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -397,13 +383,13 @@ msgstr ""
 "Aukera hau gaiturik dagoenean, aptituderi instalazio bat egitea eskatzean, "
 "lehenik egingo dituen ekintzen laburpen bat bistaraziko du."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 "Ahaztu zein pakete diren \"berriak\" pakete-zerrendak eguneratzen direnean"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -411,14 +397,14 @@ msgstr ""
 "Aukera hau gaiturik dagoenean, aptitudek pakete berrien zerrenda garbituko "
 "du pakete zerrenda eguneratu ondoren (adibidez 'u' sakatuaz)."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Ahaztu zein pakete diren \"berriak\", paketeak instalatzen edo kentzen "
 "direnean"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -428,13 +414,13 @@ msgstr ""
 "zuk komando-lerrotik instalazioa abiarazi edo paketeak instalatu edo "
 "kentzean."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "Ez erakutsi abisua aurreneko aldaketa irakurtzeko soilik moduan egitean"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -444,13 +430,13 @@ msgstr ""
 "sistema eraldatzeko baimenik izan ez arren pakete egoera bat aldatzen "
 "duzunean."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Abisatu root ez den erabiltzaile gisa ekintza pribilegiatu bat egiten "
 "saiatzean"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -462,11 +448,11 @@ msgstr ""
 "instalatzen saiatu root ez den erabiltzaile batez.  Root bezala saioa hasi "
 "eta ekintzak root baimenez burutzeko aukera emango dizu."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Ekintzak erregistratzeko fitxategia"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -478,11 +464,11 @@ msgstr ""
 "karakterea ('%B|%b'), izenaren ondorengoa sarrera estandarretik erregistroa "
 "jasoko duen shell komando bat bezala interpretatuko da."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Automatikoki ebatzi pakete baten mendekotasunak hautatuta dagoenean"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -495,12 +481,12 @@ msgstr ""
 "azkarragoa da baina hoberenak ez diren emaitzak eman edo zuzenean huts egin "
 "dezake egoera batzuetan."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Automatikoki konpondu hautsitako paketeak, instalatu edo konpondu aurretik"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -512,11 +498,11 @@ msgstr ""
 "arazoa konpontzeko duen gomendioa.  Bestela aptitudek zuri galdetuko dizu "
 "apurturiko mendekotasun arazoa konpontzeko modua."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Automatikoki instalatu gomendatutako paketeak"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -534,11 +520,11 @@ msgstr ""
 "paketeak\" aukera ere gaiturik badago instalaturiko pakete batek "
 "gomendatutako paketeak ez dira automatikoki ezabatuko."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Automatikoki kendu erabili gabeko paketeak"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -555,11 +541,11 @@ msgstr ""
 "\" ere gaiturik badago automatikoki instalaturiko paketeak ez dira kenduko "
 "instalaturiko edozein paketek gomendatzen baditu."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Automatikoki inoiz kendu behar ez diren paketeak"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -569,13 +555,13 @@ msgstr ""
 "bere beharra balu bezala erabiliko dira: inoiz ez dira erabiltzen ez "
 "direlako kentzeko bezala markatuko."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Baimendu mantenimenduak edo debekuak apurtzen dituzten mendekotasun "
 "bereizmenak"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -597,15 +583,15 @@ msgstr ""
 "instalatzeko hautatu den pakete baten mendekotasunak automatikoki "
 "instalatzean (470035. akatsaren ondorioz)."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "UI aukerak"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Mendekotasun kudeaketa"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Bestelakoak"
 
@@ -709,7 +695,7 @@ msgstr "Ezin da \"%s\"-(r)en iturburuko paketea aurkitu.\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Ezin da eraikitze-mendekotasuna bete: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -718,7 +704,7 @@ msgstr ""
 "Oharra: \"%s\",  pakete birtuala hornitzen duena\n"
 "       \"%s\", jada instalatuta dago.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -727,7 +713,7 @@ msgstr ""
 "Oharra: \"%s\", pakete birtuala hornitzen duena\n"
 "        \"%s\", instalatzera doa jada.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -736,17 +722,23 @@ msgstr ""
 "\"%s\" badago paketeen datu-basean, baina ez da pakete\n"
 "erreala, eta pakete batek ere ez du hornitzen.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" pakete birtual bat da, honek hornitua:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Bat aukeratu behar duzu instalatzeko.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "%s paketea ez dago instalatuta; ezin da bertsio-berritzea eragotzi\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -755,67 +747,59 @@ msgstr ""
 "Oharra: \"%s\" hautatzen \"%s\" \n"
 "       pakete birtualaren ordez\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s dagoeneko instalatuta dago eskatutako bertsioan (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 #| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s ez dago instalatuta, eta, beraz, ez da berrinstalatuko.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 #| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s dagoeneko instalatuta dago eskatutako bertsioan (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s ez dago instalatuta, eta, beraz, ez da berrinstalatuko.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "%s paketea ez dago instalatuta; ezin da bertsio-berritzea eragotzi\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "%s paketea ez da bertsio-berritzeko modukoa; ezin da bertsio-berritzea "
 "eragotzi\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Oharra: \"%s: %s\" ataza hautatzen instalatzeko\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "'install' edo 'forbid-version' komando batekin bakarrik zehatz daiteke "
-"pakete-bertsioa.\n"
+"pakete-bertsioa"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr ""
-"'install' komando batekin bakarrik zehatz daiteke pakete-artxibo bat.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "'install' komando batekin bakarrik zehatz daiteke pakete-artxibo bat"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -824,7 +808,7 @@ msgstr ""
 "Ezin izan da \"%s\" paketea aurkitu; 40 paketek\n"
 "baino gehiagok dute \"%s\" euren izenean.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -833,12 +817,12 @@ msgstr ""
 "Ezin izan da \"%s\" paketea aurkitu. Baina pakete hauek\n"
 "\"%s\" dute euren izenean:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Ezin izan da aurkitu izenean edo azalpenean \"%s\" duen paketerik.\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -856,7 +840,7 @@ msgstr ""
 "Ezin izan da aurkitu \"%s\"(r)ekin bat datorren paketerik. Baina\n"
 "pakete hauek \"%s\" dute azalpenean:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Okerreko ekintza-karakterea: '%c'\n"
@@ -881,105 +865,88 @@ msgstr "Err "
 msgid "Changelog download failed: %s"
 msgstr "%s aldaketen egunkaria"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "Ezin da 'sensible-pager' exekutatu, funtzionatzen duen Debian sistema da?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s ez da Debianeko pakete ofiziala, ezin da bere 'changelog' (aldaketen "
-"erregistroa) bistaratu."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Ezin izan da %s(r)e 'changelog'a aurkitu"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 #| msgid "Couldn't find a changelog for %s"
 msgid "Couldn't run pager %s"
 msgstr "Ezin izan da %s(r)e 'changelog'a aurkitu"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: Garbitzeko komandoak ez du argumenturik hartzen\n"
+msgid "The clean command takes no arguments"
+msgstr "Garbitzeko komandoak ez du argumenturik hartzen"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Ezab %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 #| msgid "Unable to look up your home directory, saving to /tmp/function_pkgs!"
 msgid "Unable to lock the download directory"
 msgstr "Ezin da etxeko direktorioa aurkitu, '/tmp/function_pkgs'-en gordetzen!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Ezab %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: Autogabitzeko komandoak ez du argumenturik hartzen\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Autogabitzeko komandoak ez du argumenturik hartzen"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Diskoan %sB libratuko dira.\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Diskoan %sB libratu ditu\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Eragiketa baliogabea: %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Ustegabeko eredu-argumentua \"keep-all\"en ondoren"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
-"Ezin da mendekotasunak segurtasunez ebatzi, saiatu --full-resolver  "
-"aukerarekin.\n"
+"Ezin da mendekotasunak segurtasunez ebatzi, saiatu --full-resolver "
+"aukerarekin"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Abortatu.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "deskargatu: gutxienez pakete bat zehaztu behar duzu deskargatzeko\n"
+msgid "download: you must specify at least one package to download"
+msgstr "deskargatu: gutxienez pakete bat zehaztu behar duzu deskargatzeko"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Ezin izan da iturburu-zerrenda irakurri"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Ezin izan da \"%s\" izeneko paketea aurkitu"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1021,33 +988,24 @@ msgid "[Working]"
 msgstr "[Lanean]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: gutxienez argumentu bat behar da\n"
-"(fitxategiak gordeko diren direktorioak).\n"
+"extract-cache-entries: gutxienez argumentu bat behar da (fitxategiak gordeko "
+"diren direktorioak)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Ez dago \"%s\" bezalako paketerik"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 "Ez da paketerik hautatu emandako bilaketako ereduan; ezin da ezer egin.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: berriak-ahaztu komandoak ez du argumenturik hartzen\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Berriak-ahaztu komandoak ez du argumenturik hartzen"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Ahaztu egingo luke zein pakete diren berriak\n"
@@ -1156,17 +1114,17 @@ msgstr "Ondorengo paketeak BERTSIO-BERRITUKO dira:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Ondorengo erdi instalaturiko paketeak konfiguratuko dira:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Ondorengo FUNTSEZKO paketeak KENDU egingo dira!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Ondorengo FUNTSEZKO paketeak HAUTSI egingo dira ekintza honekin:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1175,16 +1133,16 @@ msgstr ""
 "KONTUZ: ekintza hau egitean, beharbada sistema hondatu egingo da!\n"
 "         Ez baldin badakizu ZEHAZKI zer egiten ari zaren, EZ jarraitu!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Badakit oso ideia txarra dela"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Jarraitzeko, idatzi esaldi hau: \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1201,7 +1159,7 @@ msgstr ""
 "Instalazioarekin jarraitu zertan ari zaren ziur bazaude bakarrik.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1210,7 +1168,7 @@ msgstr ""
 "*** ABISUA ***   Fidagarritasun-bortxaketei ez ikusi egiten. Zergatia:\n"
 "                  %s::CmdLine::Ignore-Trust-Violations 'egia' baita!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1223,7 +1181,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1232,99 +1190,99 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Ez ikusi egin abisuari eta jarraitu hala ere?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Jarraitzeko, sartu \"%s\"; bertan behera uzteko sartu \"%s\":"
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Sarrera ezezaguna. Sartu \"%s\" edo \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Ondorengo paketeak GOMENDATUTAKOAK dira, baina EZ dira instalatuko:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Ondorengo paketeak IRADOKITAKOAK dira, baina EZ dira instalatuko: \n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Ez da paketerik instalatuko, bertsio-berrituko edo kenduko.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pakete bertsio-berrituta, %lu berriki instalatuta, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu berrinstalatuta, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu aurreko bertsiora itzulita, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu kentzeko, eta %lu bertsio-berritu gabe.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Artxiboetako %sB/%sB eskuratu behar dira. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Artxiboetako %sB eskuratu behar dira. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Deskonprimitu ondoren, %sB erabiliko dira.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Deskonprimitu ondoren, %sB libratuko dira.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Ez dago paketerik erakusteko -- sartu paketearen izena 'i'-ren azpiko "
 "lerroan.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Jarraitzeko, sakatu 'Sartu' tekla."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Ez da paketerik aurkitu -- sartu paketeen izenak 'c'-ren azpiko lerroan.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1333,30 +1291,30 @@ msgstr ""
 "Ez da paketerik aurkitu -- bilaketa erro bat edo gehigo idatzi justifikatu "
 "beharreko paketeaz jarraiturik.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "jarraitu instalazioarekin"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "bertan behera utzi eta irten"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1364,12 +1322,12 @@ msgstr ""
 "erakutsi pakete baten edo gehiagoren informazioa, paketeen izenak 'i'-ren "
 "ondoren egon behar dute"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1377,39 +1335,39 @@ msgstr ""
 "erakutsi pakete baten edo gehiagoren Debian-eko aldaketen egunkaria, "
 "paketeen izenak 'c'-ren ondoren egon behar dute"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "erakutsi/ezkutatu mendekotasun-informazioa"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "erakutsi/ezkutatu pakete tamainen aldaketak"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "erakutsi/ezkutatu bertsioa"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1417,27 +1375,27 @@ msgstr ""
 "pakete soil bat instalatzeko arrazoia bilatzen saiatu, edo argitu zergatik "
 "pakete bat instalatzeak zergatik eramaten duen beste bat instalatzea."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "exekutatu mendekotasun konpontzaile automatikoa apurtutako mendekotasunak "
 "konpontzeko"
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "sartu interfaze bisual osoan"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1448,47 +1406,47 @@ msgstr ""
 "ekintza-karaktere bat, eta jarraian pakete izen edo -eredu bat edo gehiago. "
 "Ekintza pakete guztiei aplikatuko zaie. Ekintza erabilgarriak:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' paketeak instalatzeko"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M' paketeak instalatzeko eta jarri bandera pakete hauek automatikoki "
 "instalatu direla adierazteko"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' paketeak kentzeko"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' paketeak purgatzeko"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' paketeak atxikitzeko"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':' paketeak beraien uneko egoeran mantentzeko, atxikitu gabe"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' markatu automatikoki instalatu izan diren paketeak"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' markatu eskuz instalaturik izan diren paketeak"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "'&BD' pakete baten eraikitzeko mendekotasunak instalatzeko."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1496,30 +1454,30 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 #| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' markatu automatikoki instalatu izan diren paketeak"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Komandoak:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1527,20 +1485,20 @@ msgstr ""
 "Aptitudek huts egin mendekotasuna hauei konponbide bat bilatzean.  Eskuz "
 "konpondu ditzakezu edo 'n' sakatu ateratzeko."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Jarraitu nahi duzu? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Dependentzi hauek eskuz konpondu? [E/+/-/_:/?) "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Erantzun baliogabea. Sartu baliozko komando bat, edo '?' laguntza ikusteko.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1548,7 +1506,7 @@ msgstr ""
 "Sar pakete kudeaketa komando bat (adibidez '+ paketea' pakete bat "
 "instalatzeko), 'R' mendekotasuna osatze automatikoa saiatzeko edo 'N' uzteko."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1559,7 +1517,7 @@ msgstr ""
 "Mendekotasun-informazioa erakutsiko da.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1570,7 +1528,7 @@ msgstr ""
 "Mendekotasun-informazioa ez da erakutsiko.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1581,7 +1539,7 @@ msgstr ""
 "Bertsioak erakutsiko dira.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1592,7 +1550,7 @@ msgstr ""
 "Bertsiorik ez da erakutsiko.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1603,7 +1561,7 @@ msgstr ""
 "Tamaina aldaketak erakutsiko dira.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1748,6 +1706,11 @@ msgstr "Pakete/bertsio bikote bat bederen espero da '%c'-ri jarraituz"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Bertsio bat edo \"%s\" espero zen \"%s\" ondoren"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Ez dago \"%s\" bezalako paketerik"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1904,7 +1867,7 @@ msgstr ""
 "Dependentziak konpondu nahi ditut, baina ez zen mendekotasun konpontzailerik "
 "sortu."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1934,7 +1897,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Honako komandoak eskuragarri daude:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Ebazpen-egoera idazteko fitxategia:"
 
@@ -1966,7 +1929,7 @@ msgstr ""
 "*** ERROREA: bilaketa huts konponezin bat dela eta utzi egin da.  Bilatzen\n"
 "           jarraitu dezakezu, baina zenbait emaitza ezingo dira eskuratu."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1975,7 +1938,7 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 #| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
@@ -1983,21 +1946,20 @@ msgstr ""
 "Ezin dira bertsio-berritzerako mendekotasunak ebatzi (ez da konponbiderik "
 "aurkitu)"
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 #| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Ezin dira bertsio-berritzerako mendekotasunak ebatzi (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "%s(r)en iconv-ek huts egin du.\n"
+msgid "iconv of %s failed"
+msgstr "%s(r)en iconv-ek huts egin du"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "bilatu: bilaketa-termino bat eman behar duzu gutxienez\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "bilatu: bilaketa-termino bat eman behar duzu gutxienez"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2041,7 +2003,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Ondorengo paketeetan bete gabeko mendekotasunak daude:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2264,7 +2226,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Hornitzen du:"
 
@@ -2278,15 +2240,9 @@ msgstr "Azalpena: "
 msgid "Homepage: "
 msgstr "Etxe orria "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Ezin da %s paketea aurkitu"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Ezin da %s eredua analizatu"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Ez da paketerik aurkitu"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2297,13 +2253,14 @@ msgstr "Paketeak deskargatu/instalatu/kenduko ditu.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Barne-errorea; ordenatzea ez da amaitu"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Zaharkitutako deskargatutako fitxategiak ezabatzen"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
+#, fuzzy
+#| msgid "E: The update command takes no arguments\n"
+msgid "The update command takes no arguments"
 msgstr "E: Eguneratzeko komandoak ez du argumenturik hartzen\n"
 
 #: src/cmdline/cmdline_user_tag.cc:65
@@ -2323,137 +2280,159 @@ msgstr ""
 "%s: argumentu gutxiegi; gutxienez izenaren etiketa eta pakete bat espero "
 "ziren.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Ez da %s(r)en bertsio hautagairik aurkitu\n"
+msgid "No candidate version found for %s"
+msgstr "Ez da %s(r)en bertsio hautagairik aurkitu"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Ez da %s(r)en ez uneko ez bertsio hautagairik aurkitu\n"
+msgid "No current or candidate version found for %s"
+msgstr "Ez da %s(r)en ez uneko ez bertsio hautagairik aurkitu"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Ezin da aurkitu \"%s\" artxiboa, \"%s\" paketearentzat\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Ezin da aurkitu \"%s\" artxiboa, \"%s\" paketearentzat"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Ezin da aurkitu \"%s\" bertsioa, \"%s\" paketearentzat\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Ezin da aurkitu \"%s\" bertsioa, \"%s\" paketearentzat"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Barne-errorea: %i balio baliogabea pasatu da hona: cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Barne-errorea: %i balio baliogabea pasatu da hona: cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Ezin dira bai artxiboa eta bai bertsioa zehaztu pakete batentzat\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Ezin dira bai artxiboa eta bai bertsioa zehaztu pakete batentzat"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't find a changelog for %s"
-msgid "Couldn't find task '%s'"
-msgstr "Ezin izan da %s(r)e 'changelog'a aurkitu"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "Hautsitako %d [%+d]"
 msgstr[1] "%d hautsitak [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "bertsio-berritze %d [%+d]"
 msgstr[1] "%d bertsio-berritze [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "berri %d [%+d]"
 msgstr[1] "%d berri [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Uneko egoera: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "Zaharkitu berri den pakete %d dago."
 msgstr[1] "Zaharkitu berri diren %d pakete daude."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "Zaharkitu berri den pakete %d dago: "
 msgstr[1] "Zaharkitu berri diren %d pakete daude: "
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Ez dago komarik \"%s\" etiketa-izenaren ostean"
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ezin da %s paketea aurkitu"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find task '%s'"
+msgstr "Ezin izan da %s(r)e 'changelog'a aurkitu"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Oharra: \"%s: %s\" ataza hautatzen instalatzeko\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Ezin izan da %s(r)e 'changelog'a aurkitu"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 #| msgid "Packages"
 msgid "Package %s:"
 msgstr "Paketeak"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 #| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Iturburu-paketea: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 #| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Artxiboa"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
 #| msgid "search: You must provide at least one search term\n"
-msgid "versions: You must provide at least one package selector\n"
+msgid "versions: You must provide at least one package selector"
 msgstr "bilatu: bilaketa-termino bat eman behar duzu gutxienez\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2476,7 +2455,7 @@ msgstr "Unekoa"
 msgid "Candidate"
 msgstr "Hautagarria"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Instalatu"
 
@@ -2579,24 +2558,20 @@ msgstr "Ezin da arrazoirik aurkitu %s instalatzeko.\n"
 msgid "Packages requiring %s:"
 msgstr "Honen mendeko paketeak: %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Ez dago \"%s\" izeneko paketerik."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Ezin dira analizatu aurkitutako parekatze batzuek."
 
-#: src/cmdline/cmdline_why.cc:1366
-#, fuzzy, 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"
+#: src/cmdline/cmdline_why.cc:1362
+#, c-format
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
-"%s: komando honek behintzat argumentu bat behar du (galdekatzeko paketea)."
+"%s: komando honek behintzat argumentu bat behar du (galdekatzeko paketea)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2623,11 +2598,11 @@ msgstr "BETEGABEA"
 msgid "UNAVAILABLE"
 msgstr "EZ ERABILGARRIA"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Etiketak"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Erabiltzailearen etiketak"
 
@@ -2837,33 +2812,33 @@ msgstr ""
 "lanabes bat paketeak instalatzen dagoela esan nahi du. Irakurtzeko soilik "
 "irekiko da; paketeen egoeran egindako edozein aldaketa EZ dira gordeko."
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 #| msgid "allow_choices"
 msgid "allowed"
 msgstr "onartu_aukerak"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "nagusia"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2930,36 +2905,44 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "Pakete-cachea ez dago eskuragarri. ezin da paketeak deskargatu eta instalatu"
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Barne-errorea: ezin izan da deskargatzeko paketeen zerrenda sortu"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Huts egin du %s eskuratzean: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Ezin izan dira artxibo batzuk lortu; beharbada aptitude update exekutatu, "
+"edo --fix-missing aukerarekin saiatu?"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Ezin izan dira erabilgarri ez dauden paketeak zuzendu"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr ""
 "Arazoren bat gertatu da pakete bat instalatzean. Berreskuratzen saiatuko da:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3111,13 +3094,13 @@ msgstr ""
 "\n"
 "Egunkarian erregistratzea egin da.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 #| msgid "Downloading packages"
 msgid "Filtering packages"
@@ -3237,19 +3220,19 @@ msgstr ""
 "Paketearen indize-fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
 "paketearentzat."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "%s aldaketen egunkaria"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "Aldaketen egunkariak deskargatzeko erabiliko den URLa"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
@@ -3306,28 +3289,29 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Ezin da %s eredua analizatu"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Etiketen datu-basea eraikitzen"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 #| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Ez dago instalatuta"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 #| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Ez dago instalatuta"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3490,41 +3474,41 @@ msgstr ""
 msgid "_File"
 msgstr "Faltsua"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Instalatzeko/kentzeko dauden pakete guztiak instalatu/kendu"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Paketeen bertsio berririk dagoen begiratu"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Bertsio-berritu daitezkeen paketeak, atxikita ez daudenak, markatu"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Ahaztu zein diren pakete \"berriak\""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Instalatzeko, kentzeko, hizozteko edo bertsio berritzeko  dauden pakete "
 "guztiak utzi."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Lehen deskargatutako pakete-fitxategiak ezabatu"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Jada deskargatu ezin diren pakete-fitxategiak ezabatu"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Paketeen cachea birkargatu."
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3534,7 +3518,7 @@ msgstr ""
 "Root bihurtzeko, exekutatu 'su'. Horrela programa berrabiaraziko da, baina "
 "zure ezarpenak mantenduta."
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Irten programatik"
 
@@ -3542,7 +3526,7 @@ msgstr "Irten programatik"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Azken pakete-eragiketa edo eragiketa-multzoa desegin"
 
@@ -3579,7 +3563,7 @@ msgid "_Help"
 msgstr "Laguntza"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3589,19 +3573,19 @@ msgstr ""
 msgid "Update"
 msgstr "Zerrendaren eguneraketa"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Paketeak"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Aurrebista"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Ebatzi"
 
@@ -3808,7 +3792,7 @@ msgid "Fix Manually"
 msgstr "Eskuliburua"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Bertsio-berritu"
 
@@ -4406,11 +4390,11 @@ msgstr "Instalatuta"
 msgid "Reinstall"
 msgstr "Berrinstalatu"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Itzuli aurreko bertsiora"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Kendu"
 
@@ -4450,7 +4434,7 @@ msgstr "Ezarri iragazkia pakete-zerrendari"
 msgid "Download already running."
 msgstr "Deskargatzen..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Pakete-zerrenda baten eguneratzea edo instalazioa dagoeneko egiten ari da."
@@ -4519,29 +4503,29 @@ msgstr "Ez dago hautsitako paketerik."
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Ezin da %s konfigurazio-fitxategi berriarekin ordeztu"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Paketeak deskargatzen"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Ez dago hautsitako paketerik."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Ez dago hautsitako paketerik."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 #| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Ebatzi mendekotasunak"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 #| msgid "No packages are broken."
 msgid "%d package is broken"
@@ -4549,13 +4533,13 @@ msgid_plural "%d packages are broken."
 msgstr[0] "Ez dago hautsitako paketerik."
 msgstr[1] "Ez dago hautsitako paketerik."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 #| msgid "%s changes"
 msgid "View changes"
 msgstr "%s aldaketa"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 #| msgid "%s changes"
 msgid "Apply changes"
@@ -4564,7 +4548,7 @@ msgstr "%s aldaketa"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 #| msgid "%d install"
 #| msgid_plural "%d installs"
@@ -4576,7 +4560,7 @@ msgstr[1] "%d instalatu"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 #| msgid "failed to remove %s"
 msgid "%d package to remove"
@@ -4584,62 +4568,62 @@ msgid_plural "%d packages to remove"
 msgstr[0] "huts egin du %s kentzean"
 msgstr[1] "huts egin du %s kentzean"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 #| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "Deskarga-tamaina"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 #| msgid "not installed"
 msgid "Not implemented"
 msgstr "ez dago instalatuta"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 #| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Instalatuta"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 #| msgid "^Purge"
 msgid "Purge"
 msgstr "^Purgatu"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Mantendu"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Heldu"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 #| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Erabiltzailearen eskuliburua"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4684,7 +4668,7 @@ msgstr "ez"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4735,19 +4719,19 @@ msgstr "%s; automatikoki instalatu egingo da"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 #| msgid "Search"
 msgid "Searching..."
 msgstr "Bilatu"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 #| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Ikuspegi-eraikitzea"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Ikuspegi-eraikitzea"
@@ -5509,114 +5493,115 @@ msgstr "Lerrokatze-mota ezezaguna: '%s'"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 #| msgid "By-name sorting policies take no arguments"
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Izenaren arabera ordenatzeko arauek ez dute argumenturik hartzen"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Ordenatzeko arauaren izen baliogabea, zero luzerakoa"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Itxi gabeko '(' ordenatze-arauaren azalpenean"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Taldekatze-arau mota baliogabea: '%s'"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Ezin da  deskodetu \"%ls\" ondorengo byte-anitzeko katea"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Ezin da dekodetu \"%s\" ondorengo karaktere-handidun katea"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s konpilatua -> %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Konpilatzailea: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Honekin konpilatuta:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt bertsioa %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  Ncurses bertsioa: ezezaguna\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  Ncurses bertsioa: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++ bertsioa: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Ept euskarria gaituta\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Ept euskarria desgaituta\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 #| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt bertsioa %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 #| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt bertsioa %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Ept euskarria desgaituta\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 #| msgid "%s %s compiled at %s %s\n"
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s konpilatua -> %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Qt support disabled.\n"
 msgstr "  Ept euskarria desgaituta\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5624,32 +5609,32 @@ msgstr ""
 "\n"
 "Uneko liburutegien bertsioak:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  Ncurses bertsioa: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  cwidget bertsioa: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Apt bertsioa: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Erabilera: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [aukerak] <ekintza> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5659,42 +5644,42 @@ msgstr ""
 "da):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instalatu/bertsio-berritu paketeak.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Kendu paketeak.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Kendu paketeak eta konfigurazio-fitxategiak.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Atxiki paketeak.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Utzi paketea atxikitzeari.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Markatu paketeak automatikoki instalatutako gisa.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Markatu paketeak eskuz instalatutako gisa.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5703,19 +5688,19 @@ msgstr ""
 " forbid-version - Eragotzi aptitude-ri pakete-bertsio jakin batera "
 "berritzea.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr ""
 " update       - Deskargatu pakete berrien edo bertsio-berritzeko\n"
 "                modukoenzerrendak.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Egin bertsio-berritze segurua.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5724,55 +5709,55 @@ msgstr ""
 " full-upgrade - Egin eguneratze bat, seguru asko paketeak instalatuz eta "
 "kenduz.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 #| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' pakete baten eraikitzeko mendekotasunak instalatzeko."
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Ahaztu zein pakete diren \"berriak\".\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr ""
 " search       - Bilatu pakete bat izenaren eta/edo adierazpenaren arabera.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Bistaratu pakete bati buruzko informazio xehea.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Bistaratu pakete bati buruzko informazio xehea\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Ezabatu deskargatutako pakete-fitxategiak.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Ezabatu deskargatutako pakete-fitxategi zaharrak.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog   - Ikusi paketearen aldaketa egunkaria.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Deskargatu pakete baten .deb fitxategia.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5781,7 +5766,7 @@ msgstr ""
 " reinstall    - Instalaturik dagoen paketea deskargatu eta (posibleki)\n"
 "                berrinstalatu.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5793,7 +5778,7 @@ msgstr ""
 "                edo zergatik pakete batek edo gehiagok behar duten emandako\n"
 "                paketea.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5806,57 +5791,57 @@ msgstr ""
 "                edo zergatik pakete bat edo gehiago gatazkan sartuko\n"
 "                diren emandako paketearekin (azken hau instalatzen bada).\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Aukerak:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Laguntza-testu hau.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Laguntza-testu hau\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simulatu ekintzak, baina ez burutu.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Soilik deskargatu paketeak; ez instalatu edo kendu ezer.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Beti eskatu berrespena.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5864,7 +5849,7 @@ msgstr ""
 " -y             Bai/ez erantzuneko galdera soilen erantzuna 'bai' izango "
 "da.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5873,7 +5858,7 @@ msgstr ""
 " -F format      Zehaztu bilaketa-emaitzak bistaratzeko formatu bat; ikus "
 "eskuliburua.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5882,36 +5867,36 @@ msgstr ""
 " -O order       Zehaztu bilaketa-emaitzak nola ordenatuko diren; ikus "
 "eskuliburua.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w width       Zehaztu bilaketa-emaitzak erakusteko zabalera.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Agresiboki saiatu hautsitako paketeak konpontzen.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Erakutsi paketeen zein bertsio instalatuko diren.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             Erakutsi automatikoki aldatutako paketeen mendekotasunak.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 " -Z\t\t    Erakutsi pakete bakoitzaren instalatutako tamainaren aldaketa.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5920,14 +5905,14 @@ msgstr ""
 " -v             Bistaratu informazio gehigarria (hainbat aldiz eman "
 "daiteke).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 " -t [release]   Ezarri zein banaketatatik instalatuko diren paketeak.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5936,12 +5921,12 @@ msgstr ""
 " -q             Komando-lerro moduan, progresio-gehikuntzaren adierazlea\n"
 "                kentzen du.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=balioa  'key' aukeraren konfigurazioa ezartzen du zuzenean.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5951,35 +5936,35 @@ msgstr ""
 "sendotzat\n"
 "                joko diren ala ez.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fname       Irakurri aptitude-ren egoera-informazio hedatua fname-tik.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Deskargatu pakete-zerrenda berriak abioan.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr ""
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Burutu instalazio-exekuzioa abioan.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Aptitude honek ez dauka Superbehiaren ahalmenik.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 #| msgid "true"
 msgid "trace"
@@ -5987,13 +5972,13 @@ msgstr "egia"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 #| msgid "no"
 msgid "info"
@@ -6001,13 +5986,13 @@ msgstr "ez"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 #| msgid "Err "
 msgid "error"
@@ -6015,7 +6000,7 @@ msgstr "Err "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 #| msgid "false"
 msgid "fatal"
@@ -6023,95 +6008,75 @@ msgstr "faltsua"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
 #| msgid "Invalid operation %s"
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Eragiketa baliogabea: %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "-q= -ren ondoren zenbaki bat espero da\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "q= -ren ondoren zenbaki bat espero zen, %s eskuratu da\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o aukerak gakoa=balioa formako argumentua behar du, %s lortu da\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Ez dago komarik \"%s\" etiketa-izenaren ostean.\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "ARRAROA: aukera-kode ezezaguna jaso da\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 #| msgid "Package"
 msgid "first-package"
 msgstr "Paketea"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 #| msgid "All Packages"
 msgid "all-packages"
 msgstr "Pakete guztiak"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -6119,41 +6084,35 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 #| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "-u edo -i, bietako bat bakarrik zehatz daiteke\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 #| msgid ""
 #| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u eta -i ezin dira zehaztu komando-lerroaren moduan (adib. 'install'ekin)"
 
-#: src/main.cc:1105
-#, fuzzy
-#| msgid "-u and -i may not be specified with a command"
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u eta -i ezin dira zehaztu komando batekin"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Komando ezezaguna: \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Komando ezezaguna: \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Salbuespena: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -6171,7 +6130,7 @@ msgstr "Bilatu hau: "
 msgid "Search backwards for: "
 msgstr "Bilatu atzerantz: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Mina-aurkitzailea"
 
@@ -6380,7 +6339,7 @@ msgstr "'mime-help.txt'-ren kodeketa|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 14 28 20 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Paketea"
 
@@ -6461,8 +6420,8 @@ msgstr "<E/E>"
 msgid "<none>"
 msgstr "<bat ere ez>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "birtuala"
@@ -6598,7 +6557,7 @@ msgstr ""
 msgid "Internal error: Default column string is unparsable"
 msgstr "Barne-errorea: zutabe-kate lehenetsia ez da analizagarria"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Atazak"
 
@@ -6756,11 +6715,11 @@ msgstr "Parekatze indizea 1 edo handiago izan behar da; ezin da \"%s\" izan"
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "%ls parekatze indizea luzeegia da; talde erabilgarriak (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "ETIKETA-GABEKO PAKETEAK"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6771,10 +6730,6 @@ msgstr ""
 "datubasea ez da aurkitzen (debtags instalatzeak arazo hau konpondu beharko "
 "luke)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "ETIKETA FALTA"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Iturburu-paketea: "
@@ -7402,7 +7357,7 @@ msgstr "Cachea kargatzen"
 msgid "Really quit Aptitude?"
 msgstr "Ziur zaude Aptitude-tik irten nahi duzula?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Aldatu aptituderen portaera"
 
@@ -7484,7 +7439,7 @@ msgstr ""
 msgid "License"
 msgstr "Lizentzia"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Ikusi aptitde kopiatu eta zabaltzeko baldintzak"
 
@@ -7505,7 +7460,7 @@ msgstr "Laguntza linean"
 msgid "View a brief introduction to aptitude"
 msgstr "Ikusi aptituderen laburpen txiki bat"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Laguntza"
 
@@ -7534,7 +7489,7 @@ msgstr "Eskuliburua"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Maiz egiten diren galderen zerrenda bat ikusi"
 
@@ -7576,15 +7531,15 @@ msgstr ""
 "izatea. %n%nNahi duzu direktorio hau eta bere eduki guztia ezabatzea? \"Ez\" "
 "hautatzen baduzu ez duzu mezu hau berriro ikusiko."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Ikusi paketearen deskargaren progresioa"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Pakete-deskarga"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7596,35 +7551,35 @@ msgstr ""
 "dezakete%b. Jarraitu instalazioarekin baldin eta zer egiten ari zaren ziur "
 "bazaude bakarrik .%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [%s bertsioa]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Jarraitu benetan"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Abortatu instalazioa"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Pakete-instalazioaren aurrebista"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Ikusi edota egokitu landuko diren ekintzak"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Zenbait pakete hautsita zeuden eta konpondu egin dira:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Ez dago irtenbiderik mendekotasun arazoari aurre egiteko."
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7633,7 +7588,7 @@ msgstr ""
 "Denboraz kanpo mendekotasunak ebazten saiatzean (sakatu \"%s\" sakonago "
 "saiatzeko)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7641,19 +7596,19 @@ msgstr ""
 "Paketeak instalatu/kendu ahal izateko, administratzaile-pribilegioak behar "
 "dira, eta zuk ez daukazu horrelakorik. Root kontura aldatu nahi duzu?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Root bihurtu"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Ez bihurtu root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ez dago instalatzeko, kentzeko edo bertsio-berritzeko paketerik."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7663,19 +7618,19 @@ msgstr ""
 "bertsio-berri daitezke, baina ez duzu berritzea aukeratu. Bertsio-berritze "
 "bat prestatzeko, idatzi \"U\"."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Pakete-zerrendak eguneratzen"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Ikusi pakete-zerrendaren eguneraketaren progresioa"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Zerrendaren eguneraketa"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7683,23 +7638,23 @@ msgstr ""
 "Pakete-zerrendak eguneratzeko, administratzaile-pribilegioak behar dira, eta "
 "zuk ez daukazu horrelakorik. Root kontura aldatu nahi duzu?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Denbora pasa mina bila"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Deskarga bat egiten ari den bitartean ezin da garbitu"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Deskargatutako fitxategiak ezabatzen"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Deskargatutako pakete-fitxategiak ezabatu egin dira"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7711,12 +7666,12 @@ msgstr ""
 "Pakete-zerrendak eguneratzeko, administratzaile-pribilegioak behar dira, eta "
 "zuk ez daukazu horrelakorik. Root kontura aldatu nahi duzu?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 "Apt-ren fitxategi-cachea ez dago eskuragarri. Ezin da automatikoki garbitu"
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7725,7 +7680,7 @@ msgstr ""
 "Deskargatutako pakete-fitxategi zaharkituak ezabatu egin dira, diskotik %sB "
 "libre uzten."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7737,124 +7692,124 @@ msgstr ""
 "Pakete-zerrendak eguneratzeko, administratzaile-pribilegioak behar dira, eta "
 "zuk ez daukazu horrelakorik. Root kontura aldatu nahi duzu?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Ez dago irtenbide gehiagorik."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Ezin izan da irtenbiderik aurkitu aplikatzeko."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Denboraz kanpo irtenbide bat bilatzen saiatzean."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Ebatzi mendekotasunak"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Bilatu bete gabeko mendekotasunen irtenbideak"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Ezin izan da %ls ireki"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Errorea ebazpen-egoera iraultzean"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Instalatu/kendu paketeak"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Eguneratu pakete-zerrenda"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Markatu ^Berritu daitekeena"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Ahaztu pakete berriak"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Egiteko dauden ekintzak utzi"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Garbitu paketeen cachea"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Garbitu fitxategi ^zaharkituak"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Birkargatu pakete-cachea"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Jokatu mina-aurkitzailean"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^Root bihurtu"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Irten"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Desegin"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Instalatu"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "Jarri bandera unean hautatutako paketeei, instalatzeko edo bertsio-berritzeko"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Kendu"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Jarri bandera unean hautatutako paketeei, kentzeko"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Purgatu"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Jarri bandera unean hautatutako paketeei eta beraien konfigurazioko "
 "fitxategiei, kentzeko"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Mantendu"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Bertan behera utzi hautatutako paketeen ekintza"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Heldu"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7862,11 +7817,11 @@ msgstr ""
 "Bertan behera utzi hautatutako paketearen ekintza, eta babestu etorkizuneko "
 "bertsio-berritzetik."
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Markatu ^Auto"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7874,11 +7829,11 @@ msgstr ""
 "Markatu hautatutako paketea automatikoki instalatu balitz bezala;beste "
 "paketerik behar ez duenean automatikoki ezabatua izango da"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Markatu ^Eskuz"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7886,11 +7841,11 @@ msgstr ""
 "Markatu hautatutako paketea eskuz instalatua izan balitz bezala; ez da "
 "ezabatuko zuk eskuz ezabatu arte"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Debekatutako bertsioa"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7898,19 +7853,19 @@ msgstr ""
 "Debekatu hautatutako paketearen bertsioa instalatzea;bertsio berriagoak era "
 "arruntean kudeatuko dira"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformazioa"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Bistaratu hautatutako paketeari buruzko informazio xehea"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "Paketearen informazioaren ^begizta"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7920,93 +7875,93 @@ msgstr ""
 "azalpen luzea erakutsi dezake, bere mendekotasun egoeraren laburpena, edo "
 "paketea zergatik den beharrezkoa."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Aldaketa-egunkaria"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Bistaratu hautatutako paketearen Debian-eko aldakaten egunkaria"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Aztertu irtenbidea"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Aztertu mendekotasun arazoaren irtenbideen uneko hautapena."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Aplikatu ^irtenbidea"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Landu ekintzak (irtenbidearen uneko hautapenean daudenak)."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Hurrengo irtenbidea"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Hautatu hurrengo irtenbidea (mendekotasun arazoarena)."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^Aurreko irtenbidera"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Hautatu aurreko irtenbidea (mendekotasun arazoarena)."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^Aurreneko irtenbidea"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Hautatu aurreneko irtenbidea (mendekotasun arazoarena)."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "^Azkenengo irtenbidea"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "Hautatu azkenengo irtenbidea (mendekotasun arazoarena)."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Txandakatu ^baztertutakoa"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Txandakatu unean hautatutako ekintza baztertzen den edo ez."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Txandakatu ^onartutakoa"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Txandakatu unean hautatutako ekintza onartzen den edo ez."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Ikusi helburua"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Ikusi paketea hautatutako ekintzak eragingo diona"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Ezetsi hondatutako ^mantendutakoak"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -8014,136 +7969,136 @@ msgstr ""
 "Ezetsi mantendutako paketeen egoera aldatuko luketen edo debekatutako "
 "bertsioak instalatuko lituzketen ekintza guztiak."
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Bilatu"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Bilatu aurrerantz"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "^Bilatu atzerantz"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Bilatu atzerantz"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Bilatu be^rriro"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Errepikatu azken bilaketa"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "^Bilatu Berriz Atzerantz"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Errepikatu azken bilaketa alderantzizko zentzuan"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "M^ugatu bistaratzea"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Ezarri iragazkia pakete-zerrendari"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Garbitu bistaratzea"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Kendu iragazkia pakete-zerrendari"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Bilatu ^hautsitakoa"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Bilatu hurrengo paketea, bete gabeko mendekotasunak dituena"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Hobespenak"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^UI aukerak"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Erabiltzaile-interfazean eragina duten ezarpenak aldatu"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Mendekotasunak maneiatzea"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Pakete-mendekotasunak maneiatzeko moduan eragina duten ezarpenak aldatu"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Hainbat"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Hainbat programa-ezarpen aldatu"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Desegin aukerak"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Leheneratu ezarpen guztiak sistemaren lehenespenetara"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Hurrengoa"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Hurrengo pantaila ikusi"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Aurrekoa"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Aurreko pantaila ikusi"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Itxi"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Pantaila hau itxi"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Pakete ^Ikuspegi berria"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Pakete-ikuspegi lehenetsi berri bat sortu"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "^Gomendioak Auditatu:"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -8151,87 +8106,87 @@ msgstr ""
 "Instalatzea gomendatzen diren baina instalaturik ez dauden paketeak "
 "bistarazi."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Pakete-zerrenda ^lau berria"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Ikusi sistemako pakete guztiak kategoriarik gabeko zerrenda bakarrean"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "^Debtags arakatzaile berria"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Arakatu paketeak Debtags datuak erabiliz"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Kategoria ^Arakatzaile berri bat"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Paketeak kategoriaka arakatu"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Honi buruz..."
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Programa honi buruzko informazioa ikusi"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Laguntza"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Lineako laguntza ikusi"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "Erabiltzailearen ^Eskuliburua"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Programaren eskuliburu xehatua ikusi"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Berriak"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Ikusi honakoaren bertsio bakoitzean eginiko aldaketa garrantzitsuak"
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Lizentzia"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Ekintzak"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Bilatu"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Aukerak"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Ikuspegiak"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8240,11 +8195,11 @@ msgstr ""
 "%ls: Menua  %ls:  Laguntza  %ls: Irten %ls:  Eguneratu  %ls:  Deskargatu/"
 "Instalatu/Kendu paketeak"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -8275,10 +8230,53 @@ msgstr "Aldaketen egunkariak deskargatzeko erabiliko den URLa"
 msgid "Downloading the changelog of %s"
 msgstr "Aldaketen egunkaria deskargatzen"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr ""
-"Debian-eko pakete ofizialen aldaketen erregistroak bakarrik ikus ditzakezu."
+#~ msgid "MISSING TAG"
+#~ msgstr "ETIKETA FALTA"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "Aldaketen egunkariak deskargatzeko erabiliko den URLa"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Aukera honek Debian webgunetik aldaketa-erregistroak nola deskargatuko "
+#~ "diren kontrolatzen du.  Aldaketa erregistroak URL ezberdin batetara "
+#~ "mugitzen badira bakarrik aldatu beharko zenuke."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s ez da Debianeko pakete ofiziala, ezin da bere 'changelog' (aldaketen "
+#~ "erregistroa) bistaratu."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Ezin izan da \"%s\" izeneko paketea aurkitu"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Ezin da %s eredua analizatu"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "-q= -ren ondoren zenbaki bat espero da\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "q= -ren ondoren zenbaki bat espero zen, %s eskuratu da\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o aukerak gakoa=balioa formako argumentua behar du, %s lortu da\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "ARRAROA: aukera-kode ezezaguna jaso da\n"
+
+#, fuzzy
+#~| msgid "-u and -i may not be specified with a command"
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u eta -i ezin dira zehaztu komando batekin"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr ""
+#~ "Debian-eko pakete ofizialen aldaketen erregistroak bakarrik ikus "
+#~ "ditzakezu."
 
 #~ msgid "Err "
 #~ msgstr "Err "
@@ -8457,11 +8455,6 @@ msgstr ""
 #~ msgstr "Aldaketen egunkaria deskargatzen"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Ez da bereizmenik aurkitu."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Ezin da %s pakete-hierarkiako fitxategia ireki"
diff --git a/po/fi.gmo b/po/fi.gmo
index c7f41224..9e12527e 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index 11e18b7a..7f62793d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude 0.4.4\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:25+0800\n"
 "Last-Translator: Jaakko Kangasharju <ashar@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -311,67 +311,56 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL josta muutoslokit noudetaan"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Näytä suoritettavat toiminnot ennen niiden suoritusta"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Tyhjennä uusien pakettien ryhmä pakettiluetteloita päivitettäessä"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Tyhjennä uusien pakettien ryhmä paketteja asennettaessa tai poistettaessa"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "Älä varoita muutoksista, vaikka niiden toteuttaminen ei onnistu"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr "Varoita yritettäessä toimintoa, johon oikeudet eivät riitä"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -379,11 +368,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Lokitiedoston nimi"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -391,11 +380,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Tyydytä asennettavaksi valitun paketin riippuvuudet automaattisesti"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -403,11 +392,11 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "Korjaa rikkinäiset paketit ennen asennusta tai poistoa"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -415,12 +404,12 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 #, fuzzy
 msgid "Install recommended packages automatically"
 msgstr "Asenna Suositellut paketit automaattisesti"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -431,11 +420,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Poista käyttämättömät paketit automaattisesti"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -446,22 +435,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -474,17 +463,17 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 #, fuzzy
 msgid "UI options"
 msgstr "^Käyttöliittymä"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 #, fuzzy
 msgid "Dependency handling"
 msgstr "^Riippuvuuksien käsittely"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Sekalaiset"
 
@@ -589,7 +578,7 @@ msgstr "En löydä arkistoa \"%s\" paketille \"%s\"\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "En saa hakemiston \"%s\" tiedostoluetteloa"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -598,7 +587,7 @@ msgstr ""
 "Huom: \"%s\", joka kattaa näennäispaketin\n"
 "      \"%s\", on jo asennettu.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -607,7 +596,7 @@ msgstr ""
 "Huom: \"%s\", joka kattaa näennäispaketin\n"
 "      \"%s\", on jo asennettavana.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -616,17 +605,23 @@ msgstr ""
 "\"%s\" löytyy pakettitietokannasta, mutta se ei ole\n"
 "oikea paketti eikä mikään paketti kata sitä.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" on näennäispaketti, jonka kattaa\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Yksi on valittava asennettavaksi.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "Pakettia %s ei ole asennettu, joten päivitystä ei ole tarpeen estää\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -635,65 +630,57 @@ msgstr ""
 "Huom: valitsen paketin \"%s\" enkä\n"
 "      näennäispakettia \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "Paketin %s pyydetty versio %s on jo asennettuna\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 #| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "Pakettia %s ei ole asennettu, joten sitä ei asenneta uudelleen.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 #| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "Paketin %s pyydetty versio %s on jo asennettuna\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "Pakettia %s ei ole asennettu, joten sitä ei asenneta uudelleen.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Pakettia %s ei ole asennettu, joten sitä ei poisteta\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pakettia %s ei ole asennettu, joten päivitystä ei ole tarpeen estää\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Paketti %s ei ole päivitettävissä, joten päivitystä ei ole tarpeen estää\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Huom: valitsen tehtävän \"%s: %s\" asennettavaksi\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
-"Vain 'install'- ja 'forbid-version'-komennoille voi määrittää paketin "
-"version.\n"
+"Vain 'install'- ja 'forbid-version'-komennoille voi määrittää paketin version"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Vain 'install'-komennolle voi määrittää paketin arkiston.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Vain 'install'-komennolle voi määrittää paketin arkiston"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -702,7 +689,7 @@ msgstr ""
 "En löytänyt pakettia \"%s\" ja yli 40 paketin\n"
 "nimessä on merkkijono \"%s\".\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -711,13 +698,13 @@ msgstr ""
 "En löytänyt pakettia \"%s\".  Näiden pakettien\n"
 "nimet sisältävät merkkijonon \"%s\":\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "En löytänyt pakettia, jonka nimi tai kuvaus sisältäisi merkkijonon \"%s\".\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -735,7 +722,7 @@ msgstr ""
 "En löytänyt pakettia, jonka nimi sisältäisi merkkijonon \"%s\".\n"
 "Näiden pakettien kuvaus sisältää merkkijonon \"%s\":\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Virheellinen komentomerkki '%c'\n"
@@ -760,31 +747,25 @@ msgstr "Virhe "
 msgid "Changelog download failed: %s"
 msgstr "%s:n muutosloki"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "En voi käynnistää sensible-pager:ia.  Onko tämä toimiva Debian-järjestelmä?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s ei ole virallinen Debian-paketti, joten sen muutoslokia ei voi näyttää."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "En löytänyt paketin %s muutoslokia"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 #| msgid "Couldn't find a changelog for %s"
 msgid "Couldn't run pager %s"
 msgstr "En löytänyt paketin %s muutoslokia"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, fuzzy, c-format
-msgid "E: The clean command takes no arguments\n"
+#, fuzzy
+msgid "The clean command takes no arguments"
 msgstr "E: Komennolle update ei anneta argumentteja\n"
 
 #: src/cmdline/cmdline_clean.cc:66
@@ -792,70 +773,63 @@ msgstr "E: Komennolle update ei anneta argumentteja\n"
 msgid "Del %s* %spartial/*\n"
 msgstr "Tuhoa %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 #| msgid "Unable to look up your home directory, saving to /tmp/function_pkgs!"
 msgid "Unable to lock the download directory"
 msgstr "En pääse kotihakemistoosi, tallennan tiedostoon /tmp/function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Tuhoa %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, fuzzy, c-format
-msgid "E: The autoclean command takes no arguments\n"
+#: src/cmdline/cmdline_clean.cc:127
+#, fuzzy
+msgid "The autoclean command takes no arguments"
 msgstr "E: Komennolle update ei anneta argumentteja\n"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Vapauttaisi %sB levytilaa\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "%sB levytilaa vapautettu\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Virheellinen toiminto %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "\"keep-all\":ia ei saa seurata kaava"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, fuzzy, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+#, fuzzy
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr "Riippuvuuksien selvitys ei onnistunut."
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Keskeytys.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "nouto: ainakin yksi noudettava paketti on annettava\n"
+msgid "download: you must specify at least one package to download"
+msgstr "nouto: ainakin yksi noudettava paketti on annettava"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "En pystynyt lukemaan pakettivarastoluetteloa"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "En löytänyt pakettia \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -895,30 +869,22 @@ msgid "[Working]"
 msgstr "[Toimin]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Pakettia \"%s\" ei ole olemassa"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, fuzzy, c-format
-msgid "E: The forget-new command takes no arguments\n"
+#, fuzzy
+msgid "The forget-new command takes no arguments"
 msgstr "E: Komennolle update ei anneta argumentteja\n"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Unohtaisi, mitkä paketit ovat uusia\n"
@@ -1029,17 +995,17 @@ msgstr "Nämä paketit päivitetään:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Nämä paketit päivitetään:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Nämä VÄLTTÄMÄTTÖMÄT paketit POISTETAAN!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Tämä toiminto RIKKOO nämä VÄLTTÄMÄTTÖMÄT paketit:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1048,16 +1014,16 @@ msgstr ""
 "VAROITUS: Tämä toiminto luultavasti hajoittaa järjestelmäsi!\n"
 "          ÄLÄ jatka, ellet tiedä VARMASTI, mitä teet!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Kyllä, tiedän hyvin, että tämä on aivan onnettoman surkea ajatus"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Kirjoita \"%s\" jatkaaksesi:\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1074,7 +1040,7 @@ msgstr ""
 "ovat kunnollisia.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1083,7 +1049,7 @@ msgstr ""
 "*** VAROITUS ***   Sivuutan luottamuspuutteet koska\n"
 "                   %s::CmdLine::Ignore-Trust-Violations on 'true'!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 #, fuzzy
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1097,7 +1063,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1106,126 +1072,126 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Haluatko sivuuttaa tämän varoituksen ja jatkaa?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Kirjoita \"%s\" jatkaaksesi, \"%s\" keskeyttääksesi: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Virheellinen syöte.  Kirjoita joko \"%s\" tai \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Näitä SUOSITELTUJA paketteja EI asenneta:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Näitä EHDOTETTUJA paketteja EI asenneta:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Mitään paketteja ei asenneta, päivitetä tai poisteta.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu päivitettyä pakettia, %lu uutta asennusta, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu uudelleen asennettua, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu vanhennettua, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu poistettavaa ja %lu päivittämätöntä.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Tarvitsee noutaa %sB/%sB arkistoista. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Tarvitsee noutaa %sB arkistoista. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Levytilaa kuluu %sB purkamisen jälkeen.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Levytilaa vapautuu %sB purkamisen jälkeen.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Ei näytettäviä paketteja -- anna pakettien nimet 'i':n jälkeen.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Paina Return jatkaaksesi."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Paketteja ei löytynyt -- anna pakettien nimet 'c':n jälkeen.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "jatka asennusta"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "keskeytä ja lopeta"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1233,12 +1199,12 @@ msgstr ""
 "näytä tiedot yhdestä tai useammasta paketista; kirjoita pakettien nimet 'i':"
 "n jälkeen"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1246,63 +1212,63 @@ msgstr ""
 "näytä Debianin muutoslokit yhdestä tai useammasta paketista; kirjoita "
 "pakettien nimet 'c':n jälkeen"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "näytä/älä näytä riippuvuustietoja"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "näytä/älä näytä muutoksia pakettien koissa"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "näytä/älä näytä versionumeroita"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "siirry kokoruudun käyttötilaan"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1314,46 +1280,46 @@ msgstr ""
 "suoritetaan kaikille luettelemillesi paketeille.  Käytössä olevat toiminnot "
 "ovat:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' asentaaksesi paketteja"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M' asentaaksesi paketteja ja merkitäksesi ne automaattisesti asennetuiksi"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' poistaaksesi paketteja"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' siivotaksesi paketteja"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' jäädyttääksesi paketteja"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':' säilyttääksesi paketteja nykyisessä tilassaan jäädyttämättä niitä"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' merkitäksesi paketteja automaattisesti asennetuiksi"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' merkitäksesi paketteja käsin asennetuiksi"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1361,55 +1327,55 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 #| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' merkitäksesi paketteja automaattisesti asennetuiksi"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Komennot:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Haluatko jatkaa? [Kyllä=y/ei=n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Virheellinen komento.  Anna hyväksytty komento tai '?' saadaksesi apua.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1420,7 +1386,7 @@ msgstr ""
 "Riippuvuustiedot näytetään.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1431,7 +1397,7 @@ msgstr ""
 "Riippuvuustietoja ei näytetä.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1442,7 +1408,7 @@ msgstr ""
 "Versiot näytetään.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1453,7 +1419,7 @@ msgstr ""
 "Versioita ei näytetä.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1464,7 +1430,7 @@ msgstr ""
 "Kokojen muutokset näytetään.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1596,6 +1562,11 @@ msgstr "'%c':ta pitäisi seurata ainakin yksi paketti-versio-pari"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Nimeä \"%s\" ei seurannut versio"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Pakettia \"%s\" ei ole olemassa"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1748,7 +1719,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1776,7 +1747,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Käytettävissä olevat komennot:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Mihin tiedostoon selvityksen tila tallennetaan? "
 
@@ -1808,7 +1779,7 @@ msgid ""
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1817,25 +1788,24 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Riippuvuuksien selvitys epäonnistui!  Luovutan..."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Riippuvuuksien selvitys ei onnistunut."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "%s:n iconv epäonnistui.\n"
+msgid "iconv of %s failed"
+msgstr "%s:n iconv epäonnistui"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "search: Ainakin yksi hakuehto tarvitaan\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "search: Ainakin yksi hakuehto tarvitaan"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1879,7 +1849,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Näillä paketeilla on tyydyttämättömiä riippuvuuksia:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2102,7 +2072,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Katetut"
 
@@ -2116,15 +2086,9 @@ msgstr "Kuvaus: "
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "En löytänyt pakettia %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "En ymmärrä kaavaa %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Yhtään pakettia ei löytynyt"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2135,14 +2099,13 @@ msgstr "Noutaisi tai asentaisi tai poistaisi paketteja.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Sisäinen virhe, järjestäminen ei onnistunut"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Poistan vanhentuneita tiedostoja"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: Komennolle update ei anneta argumentteja\n"
+msgid "The update command takes no arguments"
+msgstr "Komennolle update ei anneta argumentteja"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, fuzzy, c-format
@@ -2159,137 +2122,159 @@ msgstr "En löydä versiota \"%s\" paketista \"%s\"\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Paketista %s ei löytynyt ehdotettavaa versiota\n"
+msgid "No candidate version found for %s"
+msgstr "Paketista %s ei löytynyt ehdotettavaa versiota"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Paketista %s ei löytynyt mitään versiota\n"
+msgid "No current or candidate version found for %s"
+msgstr "Paketista %s ei löytynyt mitään versiota"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "En löydä arkistoa \"%s\" paketille \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "En löydä arkistoa \"%s\" paketille \"%s\""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "En löydä versiota \"%s\" paketista \"%s\"\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "En löydä versiota \"%s\" paketista \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Sisäinen virhe: virheellinen arvo %i funktiolle cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Sisäinen virhe: virheellinen arvo %i funktiolle cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Et voi määrittää sekä arkistoa että versiota paketista\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Et voi määrittää sekä arkistoa että versiota paketista"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't find a changelog for %s"
-msgid "Couldn't find task '%s'"
-msgstr "En löytänyt paketin %s muutoslokia"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "En löytänyt pakettia %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find task '%s'"
+msgstr "En löytänyt paketin %s muutoslokia"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Huom: valitsen tehtävän \"%s: %s\" asennettavaksi\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "En löytänyt paketin %s muutoslokia"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 #| msgid "Packages"
 msgid "Package %s:"
 msgstr "Paketit"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 #| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Lähdekoodipaketti: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 #| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arkisto"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
 #| msgid "search: You must provide at least one search term\n"
-msgid "versions: You must provide at least one package selector\n"
+msgid "versions: You must provide at least one package selector"
 msgstr "search: Ainakin yksi hakuehto tarvitaan\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2315,7 +2300,7 @@ msgstr ""
 msgid "Candidate"
 msgstr "Ehd.ver"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Asennus"
 
@@ -2420,21 +2405,19 @@ msgstr "Toteutettavaa ratkaisua ei löytynyt."
 msgid "Packages requiring %s:"
 msgstr "%s:sta riippuvat paketit"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, fuzzy, c-format
 msgid "No package named \"%s\" exists."
 msgstr "En löytänyt pakettia \"%s\""
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 #, fuzzy
 msgid "Unable to parse some match patterns."
 msgstr "En ymmärrä kaavaa %s"
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 
 #: src/cmdline/cmdline_why.h:212
@@ -2462,11 +2445,11 @@ msgstr "TYYDYTTÄMÄTÖN"
 msgid "UNAVAILABLE"
 msgstr "EI SAATAVILLA"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Merkit"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 #, fuzzy
 msgid "User Tags"
 msgstr "Merkit"
@@ -2672,31 +2655,31 @@ msgstr ""
 "Varastotiedoston lukitus epäonnistui.  Pakettien tiloihin tekemäsi muutokset "
 "EIVÄT säily!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "main"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2763,35 +2746,43 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr "Pakettivarasto ei ole saatavilla; paketteja ei voi noutaa tai asentaa."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 "Sisäinen virhe: en pystynyt muodostamaan luetteloa noudettavista paketeista"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "%s:n nouto epäonnistui: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Joidenkin arkistojen nouto ei onnistunut, ehkä \"aptitude update\" auttaa "
+"tai kokeile --fix-missing?"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "En pystynyt toipumaan pakettien saavuttamattomuudesta"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Jonkin paketin asennus epäonnistui.  Yritän toipua:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2942,13 +2933,13 @@ msgstr ""
 "\n"
 "Loki kirjoitettu.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 #| msgid "Downloading packages"
 msgid "Filtering packages"
@@ -3061,19 +3052,19 @@ msgid ""
 msgstr ""
 "Pakettihakemisto on hajalla.  Paketilta %s puuttuu Tiedostonimi-kenttä."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "%s:n muutosloki"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL josta muutoslokit noudetaan"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
@@ -3124,28 +3115,29 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "En ymmärrä kaavaa %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Rakennan merkkitietokantaa"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 #| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Ei asennettu"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 #| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Ei asennettu"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3303,40 +3295,40 @@ msgstr ""
 msgid "_File"
 msgstr "Lopeta"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Suorita kaikki määritetyt asennukset ja poistot"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Päivitä saatavilla olevien pakettien luettelo"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Merkitse päivitettäväksi kaikki päivityskelpoiset ei-jäädytetyt paketit"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Tyhjennä uusien pakettien ryhmä"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "Peruuta kaikki määritetyt asennukset ja poistot"
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Poista aiemmin noudetut pakettitiedostot"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Poista pakettitiedostot, joita ei enää voi noutaa"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Lataa pakettivarasto uudelleen muistiin."
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3346,7 +3338,7 @@ msgstr ""
 "Vaihda root-tunnukselle komennolla 'su'.  Tämä käynnistää ohjelman "
 "uudelleen, mutta asetuksesi säilyvät nykyisellään."
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Poistu ohjelmasta"
 
@@ -3354,7 +3346,7 @@ msgstr "Poistu ohjelmasta"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Peruuta viimeisin suoritettu toimi tai toimiryhmä"
 
@@ -3391,7 +3383,7 @@ msgid "_Help"
 msgstr "Apu"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3401,19 +3393,19 @@ msgstr ""
 msgid "Update"
 msgstr "Luettelopäivitys"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Paketit"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Ratkaisin"
 
@@ -3618,7 +3610,7 @@ msgid "Fix Manually"
 msgstr "Opas"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Päivitys"
 
@@ -4204,11 +4196,11 @@ msgstr "Asennettu"
 msgid "Reinstall"
 msgstr "Uudelleenasennus"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Vanhennus"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Poisto"
 
@@ -4246,7 +4238,7 @@ msgstr "Rajoita näkyvien pakettien luetteloa suodattimella"
 msgid "Download already running."
 msgstr "Noudan..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Asennus tai pakettiluettelon päivitys on jo käynnissä."
 
@@ -4314,29 +4306,29 @@ msgstr "Ei rikkinäisiä paketteja."
 msgid "Asking whether to replace the configuration file %s"
 msgstr "En pysty korvaamaan %s:a uudella asetustiedostolla"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Noudan paketteja"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Ei rikkinäisiä paketteja."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Ei rikkinäisiä paketteja."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 #| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Selvitä riippuvuudet"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 #| msgid "No packages are broken."
 msgid "%d package is broken"
@@ -4344,13 +4336,13 @@ msgid_plural "%d packages are broken."
 msgstr[0] "Mikään paketti ei ole rikki."
 msgstr[1] "Mikään paketti ei ole rikki."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 #| msgid "%s changes"
 msgid "View changes"
 msgstr "%s: muutokset"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 #| msgid "%s changes"
 msgid "Apply changes"
@@ -4359,7 +4351,7 @@ msgstr "%s: muutokset"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 #| msgid "%d install"
 #| msgid_plural "%d installs"
@@ -4371,7 +4363,7 @@ msgstr[1] "%d asennus"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 #| msgid "failed to remove %s"
 msgid "%d package to remove"
@@ -4379,62 +4371,62 @@ msgid_plural "%d packages to remove"
 msgstr[0] "%s:n poisto epäonnistui"
 msgstr[1] "%s:n poisto epäonnistui"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 #| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "Haun koko"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 #| msgid "not installed"
 msgid "Not implemented"
 msgstr "ei asennettu"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 #| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Asennettu"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 #| msgid "^Purge"
 msgid "Purge"
 msgstr "^Siivoa"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Säilytys"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Jäädytys"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 #| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Käyttöopas"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4475,7 +4467,7 @@ msgstr "ei"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4526,19 +4518,19 @@ msgstr "%s; asennetaan automaattisesti"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 #| msgid "Search"
 msgid "Searching..."
 msgstr "Haku"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 #| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Rakennan näkymää"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Rakennan näkymää"
@@ -5281,115 +5273,116 @@ msgstr "Tuntematon sijoitusasema '%s'"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 #| msgid "By-name sorting policies take no arguments"
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Nimilajittelutyyleille ei anneta argumentteja"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Lajittelutyylin nimen pituus ei saa olla nolla"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Pariton '(' lajittelutyylin kuvauksessa"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Lajittelutyylillä virheellinen tyyppi '%s'"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Monitavumerkkijonon purku \"%ls\":n jäljestä epäonnistui"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Leveämerkkijonon purku \"%s\":n jäljestä epäonnistui"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s käännöspäiväys %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kääntäjä: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 #, fuzzy
 msgid "Compiled against:\n"
 msgstr "Kääntäjä: g++ %s\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, fuzzy, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "Säilytä %F versiossa %s (%s)"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, fuzzy, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 "\n"
 "NCurses-versio: %s\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, fuzzy, c-format
 msgid "  NCurses version %s\n"
 msgstr ""
 "\n"
 "NCurses-versio: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, fuzzy, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "libsigc++-versio: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "Säilytä %F versiossa %s (%s)"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "Säilytä %F versiossa %s (%s)"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 #| msgid "%s %s compiled at %s %s\n"
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s käännöspäiväys %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:181
 #, fuzzy
 msgid ""
 "\n"
@@ -5398,36 +5391,36 @@ msgstr ""
 "\n"
 "Curses-versio: %s\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, fuzzy, c-format
 msgid "  NCurses version: %s\n"
 msgstr ""
 "\n"
 "NCurses-versio: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, fuzzy, c-format
 msgid "  cwidget version: %s\n"
 msgstr "libsigc++-versio: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, fuzzy, c-format
 msgid "  Apt version: %s\n"
 msgstr ""
 "\n"
 "Curses-versio: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Käyttö: aptitude [-S tnimi] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [valitsimet] <toiminto> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5437,42 +5430,42 @@ msgstr ""
 "tilaan):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Asenna tai päivitä paketteja.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Poista paketteja.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Poista paketteja asetustiedostoineen.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Jäädytä paketteja.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Peruuta paketin jäädytys.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Merkitse paketteja automaattisesti asennetuiksi.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Merkitse paketteja käsin asennetuiksi.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5481,70 +5474,70 @@ msgstr ""
 " forbid-version - Estä aptitudea päivittämästä pakettia määritettyyn "
 "versioon\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Nouda uusien ja päivitettävien pakettien luettelo.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, fuzzy, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " upgrade       - Päivitä turvallisesti\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, fuzzy, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
 msgstr " dist-upgrade  - Päivitä sallien pakettien asennukset ja poistot\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Tyhjennä uusien pakettien ryhmä.\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Etsi paketteja nimellä tai lausekkeella.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Näytä paketin yksityiskohtaiset tiedot.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Näytä paketin yksityiskohtaiset tiedot\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Poista noudetut pakettitiedostot.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Poista vanhat noudetut pakettitiedostot.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Näytä paketin muutosloki.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Nouda pakettitiedosto.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5553,7 +5546,7 @@ msgstr ""
 " reinstall    - Nouda ja (mahdollisesti) asenna uudelleen asennettu "
 "paketti.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, fuzzy, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5561,7 +5554,7 @@ msgid ""
 "                why one or more packages would require the given package.\n"
 msgstr " -Z\t\t    Näytä asennetun koon muutos jokaisesta paketista.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, fuzzy, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5570,64 +5563,64 @@ msgid ""
 "                lead to a conflict with the given package if installed.\n"
 msgstr " -Z\t\t    Näytä asennetun koon muutos jokaisesta paketista.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Valitsimet:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Tämä avustusteksti.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Tämä avustusteksti\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 " -s             Tulosta suoritettavat toiminnot, mutta älä suorita niitä.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Älä asenna tai poista paketteja, ainoastaan nouda ne.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Kysy aina varmistusta tai toimintoa.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             Vastaa yksinkertaisiin kyllä/ei-kysymyksiin kyllä.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5635,69 +5628,69 @@ msgid ""
 msgstr ""
 " -F muotoilu    Määritä hakutulosten näyttömuoto; katso käyttöopasta.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
 msgstr " -O järjestys   Määritä hakutulosten järjestys; katso käyttöopasta.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w leveys      Määritä näytön leveys hakutuloksia varten.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Yritä tosissaan korjata rikkinäisten pakettien "
 "riippuvuuksia.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Näytä asennettavien pakettien versiot.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             Näytä automaattisesti muutettujen pakettien riippuvuudet.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Näytä asennetun koon muutos jokaisesta paketista.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
 msgstr " -v             Näytä lisätietoa (voidaan käyttää useita kertoja).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [julkaisu]   Aseta julkaisu, josta paketit asennetaan.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr " -q             Älä näytä edistymistä komentoriviltä käytettäessä.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o avain=arvo  Anna suoraan asetuksen 'avain' arvo.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5706,34 +5699,34 @@ msgstr ""
 " --with(out)-recommends\tMääritä, käsitelläänkö suosituksia\n"
 "                riippuvuuksina.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S tnimi: Lue aptituden laajennetut tilatiedot tiedostosta tnimi.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Aloita pakettiluettelon päivitys käynnistettäessä.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             Tämä avustusteksti\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Näytä toimenpideruutu käynnistettäessä.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                      Tällä aptitudella ei ole Lehmävoimia.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 #| msgid "replaces"
 msgid "trace"
@@ -5741,13 +5734,13 @@ msgstr ", korvaus: "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 #| msgid "no"
 msgid "info"
@@ -5755,13 +5748,13 @@ msgstr "ei"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 #| msgid "Err "
 msgid "error"
@@ -5769,102 +5762,82 @@ msgstr "Virhe "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "Lopeta"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
 #| msgid "Invalid operation %s"
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Virheellinen toiminto %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "-q=:n jäljessä tarvitaan luku\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "-q=:n jäljessä tarvitaan luku, oli %s\n"
-
-#: src/main.cc:798
-#, fuzzy, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o:n argumentin on oltava muotoa avain=arvo; se oli %s"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "OUTOA: tuntematon valitsin\n"
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 #| msgid "Package"
 msgid "first-package"
 msgstr "Paketti"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 #| msgid "All Packages"
 msgid "all-packages"
 msgstr "Kaikki paketit"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5872,40 +5845,34 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 #| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Valitsimia -u ja -i ei voi käyttää yhdessä\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 #| msgid ""
 #| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr "Valitsimia -u ja -i ei voi käyttää komentorivitoiminnoissa"
 
-#: src/main.cc:1105
-#, fuzzy
-#| msgid "-u and -i may not be specified with a command"
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "Valitsimia -u ja -i ei voi käyttää komennon kanssa"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Tuntematon komento \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Tuntematon komento \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Läpipäässyt poikkeus: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, fuzzy, c-format
 msgid ""
 "Backtrace:\n"
@@ -5923,7 +5890,7 @@ msgstr "Etsi: "
 msgid "Search backwards for: "
 msgstr "Etsi taaksepäin: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Miinaharava"
 
@@ -6132,7 +6099,7 @@ msgstr "mine-help.txt-merkistö|ISO-8859-1"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 19 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Paketti"
 
@@ -6218,8 +6185,8 @@ msgstr "<???>"
 msgid "<none>"
 msgstr "<ei ole>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "näennäinen"
@@ -6353,7 +6320,7 @@ msgstr "Näyttömuotoilun purku \"%ls\":n jäljestä epäonnistui"
 msgid "Internal error: Default column string is unparsable"
 msgstr "Sisäinen virhe: Sarakejonoa ei voi jäsentää"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Tehtävät"
 
@@ -6510,21 +6477,17 @@ msgstr "Indeksin on oltava 1 tai suurempi, \"%s\" ei käy"
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "Indeksi %ls on liian suuri; ryhmät ovat (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "MERKITTÖMÄT PAKETIT"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "PUUTTUVA MERKKI"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Lähdekoodipaketti: "
@@ -7162,7 +7125,7 @@ msgstr "Lataan varastoa"
 msgid "Really quit Aptitude?"
 msgstr "Haluatko varmasti lopettaa?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -7244,7 +7207,7 @@ msgstr ""
 msgid "License"
 msgstr "^Lisenssi"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 #, fuzzy
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Näytä ohjelman kopiointiehdot"
@@ -7266,7 +7229,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Apu"
 
@@ -7296,7 +7259,7 @@ msgstr "Opas"
 msgid "FAQ"
 msgstr "^UKK"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Näytä usein kysyttyjä kysymyksiä vastauksineen"
 
@@ -7338,15 +7301,15 @@ msgstr ""
 "poistaa tämän hakemiston sisältöineen?  Jos valitset \"Ei\", tätä viestiä ei "
 "näytetä uudestaan."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Seuraa pakettien noudon edistymistä"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Pakettien nouto"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7358,35 +7321,35 @@ msgstr ""
 "turvallisuuden%b.  Sinun ei pitäisi jatkaa, ellet ole varma, että "
 "asennettavat versiot ovat kunnollisia.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versio %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Jatka"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Keskeytä asennus"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Pakettien asennuksen esikatselu"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Näytä toiminnot, jotka suoritetaan, ja muuta niitä"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Jotkut paketit olivat rikki, mutta ovat nyt kunnossa:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Näitä riippuvuusongelmia ei ole mahdollista ratkaista!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7395,7 +7358,7 @@ msgstr ""
 "Riippuvuuksien ratkaisuun annettu aika loppui (paina \"%s\" yrittääksesi "
 "pitempään)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7403,19 +7366,19 @@ msgstr ""
 "Pakettien asentaminen ja poisto vaativat ylläpitäjän oikeudet, joita sinulla "
 "ei ole.  Haluatko vaihtaa root-tunnukselle?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Vaihda root-tunnukselle"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Älä vaihda root-tunnukselle"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Mitään paketteja ei asenneta, päivitetä tai poisteta."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7424,19 +7387,19 @@ msgstr ""
 "Mitään paketteja ei asenneta, poisteta tai päivitetä.  Jotkin paketit olisi "
 "mahdollista päivittää.  Paina \"U\" päivittääksesi nämä."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Päivitän pakettiluetteloa"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Seuraa pakettiluettelon päivityksen edistymistä"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Luettelopäivitys"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7444,23 +7407,23 @@ msgstr ""
 "Pakettiluettelon päivitys vaatii ylläpitäjän oikeudet, joita sinulla ei "
 "ole.  Haluatko vaihtaa root-tunnukselle?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Hukkaa aikaa etsimällä miinoja"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Puhdistusta ei voi tehdä noudon aikana"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Poistan noudettuja tiedostoja"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Noudetut pakettitiedostot on poistettu"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7472,20 +7435,20 @@ msgstr ""
 "Pakettiluettelon päivitys vaatii ylläpitäjän oikeudet, joita sinulla ei "
 "ole.  Haluatko vaihtaa root-tunnukselle?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 "Apt:n pakettivarasto ei ole saatavilla; en voi poistaa vanhentuneita "
 "pakettitiedostoja"
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Vanhentuneet pakettitiedostot on poistettu, %sB levytilaa vapautui."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7497,131 +7460,131 @@ msgstr ""
 "Pakettiluettelon päivitys vaatii ylläpitäjän oikeudet, joita sinulla ei "
 "ole.  Haluatko vaihtaa root-tunnukselle?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Ei muita ratkaisuja"
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Toteutettavaa ratkaisua ei löytynyt."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Ratkaisun etsintään annettu aika loppui."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Selvitä riippuvuudet"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Etsi ratkaisuja tyydyttämättömiin riippuvuuksiin"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "En pysty avaamaan tiedostoa %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Selvityksen tilan tallennuksessa tapahtui virhe"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Asenna/poista paketteja"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Päivitä pakettiluettelo"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "^Merkitse päivitykset"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Unohda uudet paketit"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "^Peruuta komennot"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "Puhdista ^koko pakettivarasto"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Puhdista ^vanhentuneet tiedostot"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "Lataa ^pakettivarasto uudelleen"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "Pelaa miina^haravaa"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Vaihda ^root-tunnukselle"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Lopeta"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Peruuta"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Asenna"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Merkitse valittu paketti asennettavaksi tai päivitettäväksi"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Poista"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Merkitse valittu paketti poistettavaksi"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Siivoa"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Merkitse valittu paketti asetustiedostoineen poistettavaksi"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "Pala^uta"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Peruuta valitulle paketille määritetyt toiminnot"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Jäädytä"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "Peruuta valitulle paketille määritetyt toiminnot ja estä sen päivitys"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "^Merkitse Automaatti"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7629,11 +7592,11 @@ msgstr ""
 "Merkitse valittu paketti automaattisesti asennetuksi; se poistetaan, jos "
 "mikään muu paketti ei riipu siitä"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Merkitse ^Käsin"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7641,11 +7604,11 @@ msgstr ""
 "Merkitse valittu paketti käsin asennetuksi; sitä ei poisteta, ellet poista "
 "sitä käsin"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Estä versio"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7653,249 +7616,249 @@ msgstr ""
 "Estä valitun paketin ehdolla olevan version asennus; paketin uudemmat "
 "versiot asennetaan normaalisti"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "^Tiedot"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Näytä lisätietoa valitusta paketista"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "Muutos^loki"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Näytä valitun paketin Debian-muutosloki"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Näytä ratkaisu"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Näytä valittu riippuvuusongelmien ratkaisu."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "^Toteuta ratkaisu"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Toteuta valitun ratkaisun toimenpiteet."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Seuraava ratkaisu"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Näytä seuraava ratkaisu riippuvuusongelmiin."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^Edellinen ratkaisu"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Näytä edellinen ratkaisu riippuvuusongelmiin."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "Ensimmäinen ^ratkaisu"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Näytä ensimmäinen ratkaisu riippuvuusongelmiin."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "^Viimeinen ratkaisu"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "Näytä toistaiseksi viimeinen löydetty ratkaisu riippuvuusongelmiin."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Hylkäys"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Hylkää/älä hylkää valittua toimintoa."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "^Hyväksyntä"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Hyväksy/älä hyväksy valittua toimintoa."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Näytä kohde"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Näytä paketti, johon valittu toiminto kohdistuu"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Etsi"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Etsi eteenpäin"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "Etsi ^taaksepäin"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Etsi taaksepäin"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Etsi ^Uudestaan"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Toista edellinen haku"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 #, fuzzy
 msgid "Find Again ^Backwards"
 msgstr "Etsi ^taaksepäin"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 #, fuzzy
 msgid "Repeat the last search in the opposite direction"
 msgstr "Toista edellinen haku"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Rajoita Näkymä"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Rajoita näkyvien pakettien luetteloa suodattimella"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Laajenna Näkymä"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Poista pakettiluettelon suodatin"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "^Hae rikkinäiset"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Etsi seuraava paketti, jonka riippuvuudet eivät ole kunnossa"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 #, fuzzy
 msgid "^Preferences"
 msgstr "Esiriippuvuudet"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^Käyttöliittymä"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Muuta käyttöliittymään vaikuttavia asetuksia"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Riippuvuuksien käsittely"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Muuta pakettien riippuvuuksien käsittelyyn vaikuttavia asetuksia"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Sekalaista"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Muuta sekalaisia asetuksia"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Palauta oletukset"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Palauta kaikki asetukset ohjelman oletusasetuksiin"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Seuraava"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Siirry seuraavaan näkymään"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Edellinen"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Siirry edelliseen näkymään"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "Su^lje"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Sulje tämä näkymä"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Uusi paketti^näkymä"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Luo uusi oletusnäkymä"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Näytä ^suosittelut"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7903,88 +7866,88 @@ msgstr ""
 "Näytä paketit, joita suositellaan asennettaviksi, mutta joita ei ole vielä "
 "asennettu."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Uusi ^yksitasoinen pakettiluettelo"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Katsele kaikkia järjestelmän paketteja ilman luokitteluja"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Uusi ^Debtags-selain"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Selaa paketteja Debtags-tietoja käyttäen"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "^Uusi luokkaselain"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Selaa paketteja luokittain"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Tietoja"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Tietoja tästä ohjelmasta"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Pika-apu"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Selaa sisäänrakennettua avustustekstiä"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Käyttöopas"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Näytä ohjelman varsinainen käyttöohje"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^UKK"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Uutiset"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Näytä tärkeät muutokset, jotka on tehty kuhunkin versioon paketista "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Lisenssi"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Haku"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Asetukset"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Näkymät"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7992,11 +7955,11 @@ msgid ""
 msgstr ""
 "%ls: Valikko  %ls: Apu  %ls: Lopeta  %ls: Päivitä  %ls: Nouda/Asenna/Poista"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -8027,9 +7990,42 @@ msgstr "URL josta muutoslokit noudetaan"
 msgid "Downloading the changelog of %s"
 msgstr "Noudan muutoslokia"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Vain virallisten Debian-pakettien muutoslokit ovat saatavilla."
+#~ msgid "MISSING TAG"
+#~ msgstr "PUUTTUVA MERKKI"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL josta muutoslokit noudetaan"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s ei ole virallinen Debian-paketti, joten sen muutoslokia ei voi näyttää."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "En löytänyt pakettia \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "En ymmärrä kaavaa %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "-q=:n jäljessä tarvitaan luku\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "-q=:n jäljessä tarvitaan luku, oli %s\n"
+
+#, fuzzy
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o:n argumentin on oltava muotoa avain=arvo; se oli %s"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "OUTOA: tuntematon valitsin\n"
+
+#, fuzzy
+#~| msgid "-u and -i may not be specified with a command"
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "Valitsimia -u ja -i ei voi käyttää komennon kanssa"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Vain virallisten Debian-pakettien muutoslokit ovat saatavilla."
 
 #~ msgid "Err "
 #~ msgstr "Virhe "
@@ -8159,11 +8155,6 @@ msgstr "Vain virallisten Debian-pakettien muutoslokit ovat saatavilla."
 #~ msgstr "Noudan muutoslokia"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Ratkaisua ei löytynyt."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "En pystynyt avaamaan pakettihierarkiatiedostoa %s"
diff --git a/po/fr.gmo b/po/fr.gmo
index 3a249243..9b121744 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 850d9a36..2727b33d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:25+0800\n"
 "Last-Translator: Jean-Baka Domelevo Entfellner <domelevo@gmail.com>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -374,24 +374,10 @@ msgstr ""
 "être téléchargés depuis les archives indiquées dans le fichier sources.list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL d'où télécharger les journaux des modifications"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Cette option contrôle le patron utilisé pour télécharger les journaux des "
-"modifications depuis le site web de Debian. Vous ne devriez avoir besoin de "
-"le modifier que si l'adresse de téléchargement de ces journaux est modifiée."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Afficher une prévisualisation de ce qui sera fait avant de le faire"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -400,12 +386,12 @@ msgstr ""
 "d'effectuer une phase d'installation, il affichera tout d'abord un résumé "
 "des actions qu'il est sur le point d'effectuer."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Oublier quels paquets sont nouveaux lors des mises à jour des listes"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -414,12 +400,12 @@ msgstr ""
 "paquets après la mise à jour de la liste des paquets (par exemple, en "
 "pressant « u »)."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Oublier quels paquets sont nouveaux à l'installation ou la suppression"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -429,14 +415,14 @@ msgstr ""
 "paquets après une phase d'installation ou de suppression de paquets depuis "
 "la ligne de commande."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "Ne pas afficher de message d'avertissement lorsque la première modification "
 "est faite en mode lecture seule."
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -446,12 +432,12 @@ msgstr ""
 "avertissement si vous modifiez l'état d'un paquet et que vous n'avez pas les "
 "droits pour appliquer les modifications sur le système."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Avertir de l'utilisation d'un compte non root pour une action privilégiée"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -464,11 +450,11 @@ msgstr ""
 "(« root »). Vous aurez la possibilité de vous connecter en tant que root et "
 "d'effectuer l'action avec les privilèges de root."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Fichier journal"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -481,11 +467,11 @@ msgstr ""
 "interprété comme une commande de l'interpréteur qui recevra le journal sur "
 "l'entrée standard."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Résoudre automatiquement les dépendances des paquets sélectionnés"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -498,11 +484,11 @@ msgstr ""
 "dépendances interne, mais peut donner des résultats suboptimaux ou échouer "
 "complètement dans certains scénarios."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "Corriger les paquets cassés avant installation ou suppression"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -514,11 +500,11 @@ msgstr ""
 "la suggestion en cours du solveur de problème. Sinon, aptitude vous "
 "proposera pour confirmation une solution aux dépendances cassées."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Installer automatiquement les paquets recommandés"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -537,11 +523,11 @@ msgstr ""
 "non utilisés » est activée, les paquets qui sont recommandés par un paquet "
 "installé ne seront pas automatiquement supprimés."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Supprimer automatiquement les paquets inutilisés"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -559,11 +545,11 @@ msgstr ""
 "recommandés » est activée, les paquets installés automatiquement ne seront "
 "pas enlevés si un quelconque paquet qui les recommande est installé."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Paquets qui ne devraient jamais être automatiquement supprimés"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -573,13 +559,13 @@ msgstr ""
 "comme si un paquet installé en dépendait : il ne seront jamais considérés "
 "comme devant être supprimés en tant que paquets non utilisée."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Autoriser la résolution des dépendances qui cassent les paquets figés ou "
 "interdits"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -602,15 +588,15 @@ msgstr ""
 "d'un paquet qui vient d'être choisi pour être installé ou mis à jour, à "
 "cause du bogue n° 470035."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Options de l'interface utilisateur"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Gestion des dépendances"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Divers"
 
@@ -714,7 +700,7 @@ msgstr "Impossible de trouver le paquet source pour « %s ».\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Impossible de satisfaire les dépendance de construction : « %s ».\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -723,7 +709,7 @@ msgstr ""
 "Note : « %s », fournissant le paquet virtuel\n"
 "       « %s », est déjà installé.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -732,7 +718,7 @@ msgstr ""
 "Note : « %s », fournissant le paquet virtuel\n"
 "       « %s », est déjà en attente d'installation.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -741,17 +727,22 @@ msgstr ""
 "« %s » existe dans la base de données des paquets mais ce\n"
 "n'est pas un vrai paquet et aucun paquet ne le fournit.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "« %s » est un paquet virtuel fourni par :\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Vous devez en choisir un à installer.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Le paquet « %s » n'a pas de version susceptible d'être installée"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -760,17 +751,17 @@ msgstr ""
 "Note : sélection de « %s » à la place du\n"
 "       paquet virtuel « %s »\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s est déjà installé avec la version demandée (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s n'est pas actuellement installé, il ne sera donc pas mis à jour.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
@@ -778,52 +769,45 @@ msgstr ""
 "%s est déjà installé avec la dernière version disponible, il ne sera donc "
 "pas mis à jour.\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s n'est pas actuellement installé, il ne sera donc pas réinstallé.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Le paquet %s n'est pas installé, il ne sera donc pas enlevé.\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "Le paquet %s n'est pas installé, l'interdiction de mise à jour n'est pas "
 "possible.\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Le paquet %s n'est pas susceptible d'être mis à jour, l'interdiction de mise "
 "à jour n'est pas possible.\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Note : sélection de la tâche « %s : %s » pour installation\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Vous ne pouvez préciser une version de paquet qu'avec une commande "
-"« install » ou « forbid-version ».\n"
+"« install » ou « forbid-version »"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
 msgstr ""
 "Vous ne pouvez préciser une archive de paquet qu'avec une commande "
-"« install »I\n"
+"« install »I"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -832,7 +816,7 @@ msgstr ""
 "Impossible de trouver le paquet « %s » et plus de 40\n"
 "paquets comportent « %s » dans leur nom.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -841,14 +825,14 @@ msgstr ""
 "Impossible de trouver le paquet « %s ». Cependant, les\n"
 "paquets suivants comportent « %s » dans leur nom :\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Impossible de trouver un paquet dont le nom ou la description corresponde à "
 "« %s »\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -866,7 +850,7 @@ msgstr ""
 "Impossible de trouver un paquet correspondant à « %s ». Cependant,\n"
 "les paquets suivants comportent « %s » dans leur description :\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Le caractère « %c » ne correspond à aucune action connue\n"
@@ -888,7 +872,7 @@ msgstr "Erreur"
 msgid "Changelog download failed: %s"
 msgstr "Échec lors du téléchargement du journal des modifications : %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "Impossible d'exécuter « sensible-pager ». Ce système est-il un système "
@@ -896,96 +880,79 @@ msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s n'est pas un paquet Debian officiel : il n'est pas possible d'afficher le "
-"suivi des modifications (« changelog »)."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr ""
 "Impossible de trouver le journal des modifications (« changelog ») pour %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, c-format
 msgid "Couldn't run pager %s"
 msgstr "Impossible d'exécuter l'outil de mise en page %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E : la commande « clean » ne prend pas de paramètre\n"
+msgid "The clean command takes no arguments"
+msgstr "la commande « clean » ne prend pas de paramètre"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Effacer %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 msgid "Unable to lock the download directory"
 msgstr "Impossible de verrouiller le répertoire de téléchargement"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Eff %s %s [%so]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E : la commande « autoclean » ne prend pas de paramètre\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "la commande « autoclean » ne prend pas de paramètre"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Libérera %so d'espace disque\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "%so d'espace disque ont été libérés\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Opération non valable %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Motif inattendu passé en paramètre après « keep-all »"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "Impossible de résoudre les dépendances de façon sûre, vous devriez essayer "
-"d'utiliser l'option --full-resolver.\n"
+"d'utiliser l'option --full-resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Abandon.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "download : vous devez indiquer au moins un paquet à télécharger\n"
+msgid "download: you must specify at least one package to download"
+msgstr "download : vous devez indiquer au moins un paquet à télécharger"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Impossible de lire la liste des sources"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Impossible de trouver un paquet appelé « %s »"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1023,23 +990,14 @@ msgid "[Working]"
 msgstr "[En cours]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 "extract-cache-entries : au moins un paramètre est requis (le répertoire où "
-"sont.\n"
-"écrits les fichiers).\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Le paquet « %s » n'existe pas"
+"sont écrits les fichiers)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
@@ -1047,11 +1005,10 @@ msgstr ""
 "aucune action à entreprendre.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E : la commande « forget-new » ne prend pas de paramètre\n"
+msgid "The forget-new command takes no arguments"
+msgstr "la commande « forget-new » ne prend pas de paramètre"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Oublier quels paquets sont « nouveaux »\n"
@@ -1163,17 +1120,17 @@ msgstr "Les paquets suivants seront mis à jour : "
 msgid "The following partially installed packages will be configured:"
 msgstr "Les paquets partiellement installés suivants seront configurés : "
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Les paquets ESSENTIELS suivants vont être ENLEVÉS !\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Les paquets ESSENTIELS suivants vont être CASSÉS par cette action :\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1184,16 +1141,16 @@ msgstr ""
 "            Ne PAS poursuivre à moins que vous ne sachiez EXACTEMENT ce\n"
 "            que vous faites !\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Je suis conscient que c'est une très mauvaise idée"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Pour continuer, entrer la phrase « %s » :\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1211,7 +1168,7 @@ msgstr ""
 "que c'est bien votre intention.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1221,7 +1178,7 @@ msgstr ""
 "                  %s::CmdLine::Ignore-Trust-Violations a la valeur "
 "« true ».\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1234,7 +1191,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr "Continuer en ignorant cet avertissement|Oui"
 
@@ -1243,100 +1200,100 @@ msgstr "Continuer en ignorant cet avertissement|Oui"
 #. 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr "Abandonner en tenant compte de l'avertissement|Non"
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Voulez-vous ignorer cet avertissement et continuer quand même ?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr ""
 "Pour continuer, entrer « %s ». Pour interrompre l'installation, entrer "
 "« %s » : "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Saisie incorrecte. Vous devez entrer « %s » ou « %s ».\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Les paquets suivants sont RECOMMANDÉS mais ne seront pas installés :\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Les paquets suivants sont SUGGÉRÉS mais ne seront pas installés :\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Aucun paquet ne va être installé, mis à jour ou enlevé.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paquets mis à jour, %lu nouvellement installés, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu réinstallés, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu remis à une version antérieure, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu à enlever et %lu non mis à jour.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Il est nécessaire de télécharger %so/%so d'archives. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Il est nécessaire de télécharger %so d'archives. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Après dépaquetage, %so seront utilisés.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Après dépaquetage, %so seront libérés.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Aucun paquet à afficher — indiquez les noms de paquets à la suite de « i ».\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Appuyez sur Entrée pour continuer."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Aucun paquet trouvé — indiquez les noms de paquets à la suite de « c ».\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1345,30 +1302,30 @@ msgstr ""
 "Aucun paquet trouvé — veuillez indiquer une ou plusieurs racines pour la "
 "recherche, suivie(s) par le nom du paquet à justifier.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y : %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "poursuivre l'installation"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n : %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "abandonner et quitter"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i : %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1376,12 +1333,12 @@ msgstr ""
 "afficher les informations concernant un ou plusieurs paquets, les noms de "
 "paquets doivent suivre le « i »"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c : %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1389,39 +1346,39 @@ msgstr ""
 "Afficher les fichiers de suivi des modifications de Debian (« changelog ») "
 "d'un ou de plusieurs paquets ; les noms de paquets doivent suivre le « c »"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d : %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "basculer vers l'affichage des informations de dépendances"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s : %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "basculer vers l'affichage de la modification de la taille des paquets"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v : %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "basculer vers l'affichage des numéros de version"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w : %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1430,27 +1387,27 @@ msgstr ""
 "pourquoi l'installation d'un seul paquet devrait conduire à installer "
 "d'autres paquets."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r : %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "résoudre automatiquement les dépendances pour corriger les dépendances "
 "incorrectes."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e : %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "basculer vers l'interface visuelle"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1462,50 +1419,50 @@ msgstr ""
 "de plusieurs noms de paquets (ou motif). L'action sera appliquée à tous les "
 "paquets que vous avez indiqués. Les actions possibles sont les suivantes :"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "« + » pour installer des paquets"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "« +M » pour installer des paquets et les marquer aussitôt comme ayant été "
 "installés automatiquement."
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "« - » pour supprimer des paquets"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "« _ » pour purger des paquets"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "« = » pour figer des paquets"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 "« : » pour conserver les paquets dans leur état actuel sans les mettre dans "
 "l'état figé (« hold »)"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr ""
 "« &M » pour marquer des paquets comme ayant été installés automatiquement"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "« &m » pour marquer des paquets comme ayant été installés manuellement"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "« &BD » pour installer les dépendances de construction d'un paquet."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1518,30 +1475,30 @@ msgstr ""
 "paquet. On peut rencontrer n'importe quelle combinaison des caractères "
 "suivants :"
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 msgid "'a': the package was automatically installed or removed."
 msgstr "'a' : le paquet a été automatiquement installé ou désinstallé."
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 "« b » : les changements proposés ne respectent pas certaines dépendances "
 "entre paquets."
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr "« p » : le paquet sera purgé en plus d'être supprimé."
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr "« u » : le paquet, inutilisé, va être supprimé."
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Commandes :"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1549,21 +1506,21 @@ msgstr ""
 "Il n'a pas été possible de résoudre ces dépendances. Vous pouvez les "
 "résoudre vous-même ou taper « n » pour quitter."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Voulez-vous continuer ? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Faut-il résoudre ces dépendances manuellement ? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Réponse incorrecte. Veuillez entrer une commande correcte ou « ? » pour "
 "obtenir de l'aide.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1572,7 +1529,7 @@ msgstr ""
 "installer un paquet), « R » pour lancer la résolution automatique des "
 "dépendances ou « N » pour quitter."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1583,7 +1540,7 @@ msgstr ""
 "Les informations de dépendances seront affichées.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1594,7 +1551,7 @@ msgstr ""
 "Les informations de dépendances ne seront pas affichées.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1605,7 +1562,7 @@ msgstr ""
 "Les versions seront affichées.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1616,7 +1573,7 @@ msgstr ""
 "Les versions ne seront pas affichées.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1627,7 +1584,7 @@ msgstr ""
 "Les modifications de taille seront affichées.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1768,6 +1725,11 @@ msgstr "Vous devez indiquer au moins une paire « paquet/version » après «Â
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Numéro de version attendu après « %s » ou « %s »"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Le paquet « %s » n'existe pas"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1931,7 +1893,7 @@ msgstr ""
 "Il serait nécessaire de résoudre les dépendances mais aucun solveur de "
 "dépendances n'a été créé."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1962,7 +1924,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Les commandes suivantes sont disponibles :"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Fichier dans lequel sera écrit l'état du solveur :"
 
@@ -1997,7 +1959,7 @@ msgstr ""
 "             Vous pouvez poursuivre la recherche mais certaines solutions\n"
 "             seront inaccessibles."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -2010,26 +1972,25 @@ msgstr ""
 "  Vous pourrez peut-être surmonter ce problème en augmentant la valeur de\n"
 "  Aptitude::ProblemResolver::StepLimit (actuellement %d)."
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Impossible de résoudre les dépendances pour la mise à jour : aucune solution "
 "trouvée."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Impossible de résoudre les dépendances pour la mise à jour : %s"
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "Échec de « iconv » sur %s.\n"
+msgid "iconv of %s failed"
+msgstr "Échec de « iconv » sur %s"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "search : vous devez donner au moins un terme de recherche\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "search : vous devez donner au moins un terme de recherche"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2072,7 +2033,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Les paquets suivants ont des dépendances non satisfaites :\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2295,7 +2256,7 @@ msgid "Enhances"
 msgstr "Améliore"
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Fournit"
 
@@ -2309,15 +2270,9 @@ msgstr "Description : "
 msgid "Homepage: "
 msgstr "Site : "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Paquet %s introuvable"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Analyse du motif %s impossible"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Aucun paquet n'a été trouvé"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2328,14 +2283,13 @@ msgstr "Charger/installer/enlever des paquets.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Erreur interne. Le classement ne s'est pas terminé"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Effacement des fichiers téléchargés périmés"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E : la commande update ne prend pas de paramètre\n"
+msgid "The update command takes no arguments"
+msgstr "la commande update ne prend pas de paramètre"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2354,127 +2308,150 @@ msgstr ""
 "%s : pas assez de paramètres. Au moins un nom d'étiquette et un nom de "
 "paquet sont nécessaires.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Pas de version candidate trouvée pour %s\n"
+msgid "No candidate version found for %s"
+msgstr "Pas de version candidate trouvée pour %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Pas de version courante ou candidate trouvée pour %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "Pas de version courante ou candidate trouvée pour %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Impossible de trouver l'archive « %s » pour le paquet « %s »\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Impossible de trouver l'archive « %s » pour le paquet « %s »"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Impossible de trouver la version « %s » du paquet « %s »\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Impossible de trouver la version « %s » du paquet « %s »"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
 msgstr ""
-"Erreur interne : la valeur incorrecte %i a été passée à cmdline_find_ver !\n"
+"Erreur interne : la valeur incorrecte %i a été passée à cmdline_find_ver !"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
 msgstr ""
 "Vous ne pouvez pas indiquer à la fois une archive et une version pour un "
-"paquet\n"
+"paquet"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't run pager %s"
-msgid "Couldn't find task '%s'"
-msgstr "Impossible d'exécuter l'outil de mise en page %s"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d paquet cassé [%+d]"
 msgstr[1] "%d paquets cassés [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d mise à jour restante [%+d]"
 msgstr[1] "%d mises à jour restantes [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d nouveau paquet [%+d]"
 msgstr[1] "%d nouveaux paquets [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "État actuel : %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "%d nouveau paquet obsolète."
 msgstr[1] "%d nouveaux paquets obsolètes."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "%d nouveau paquet obsolète :"
 msgstr[1] "%d nouveaux paquets obsolètes :"
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Pas de virgule après le nom d'étiquette « %s »"
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Paquet %s introuvable"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't run pager %s"
+msgid "Couldn't find task '%s'"
+msgstr "Impossible d'exécuter l'outil de mise en page %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Note : sélection de la tâche « %s : %s » pour installation\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr ""
+"Impossible de trouver le journal des modifications (« changelog ») pour %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, c-format
 msgid "Package %s:"
 msgstr "Paquet %s :"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, c-format
 msgid "Source package %s:"
 msgstr "Paquet source %s : "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, c-format
 msgid "Archive %s:"
 msgstr "Archive %s :"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr "--group-by|archive"
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr "--group-by|auto"
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr "--group-by|none"
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr "--group-by|package"
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr "--group-by|source-package"
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr "--group-by|source-version"
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
@@ -2483,10 +2460,9 @@ msgstr ""
 "Le mode de regroupement des paquets \"%s\" n'est pas licite (merci de "
 "choisir parmi « auto », « none », « package » ou « source-package »)"
 
-#: src/cmdline/cmdline_versions.cc:584
-#, c-format
-msgid "versions: You must provide at least one package selector\n"
-msgstr "versions : vous devez fournir au moins un sélecteur de paquet\n"
+#: src/cmdline/cmdline_versions.cc:578
+msgid "versions: You must provide at least one package selector"
+msgstr "versions : vous devez fournir au moins un sélecteur de paquet"
 
 #: src/cmdline/cmdline_why.cc:290
 msgid "dep_level"
@@ -2508,7 +2484,7 @@ msgstr "Courant(e)"
 msgid "Candidate"
 msgstr "Candidat(e)"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Installer"
 
@@ -2612,23 +2588,20 @@ msgstr "Impossible de trouver une raison pour installer %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Paquets dépendants de %s :"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Il n'existe pas de paquet appelé « %s »."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Impossible d'analyser certains motifs de correspondance."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
-"%s: cette commande a besoin d'au moins un paramètre (le paquet à "
-"rechercher).\n"
+"%s: cette commande a besoin d'au moins un paramètre (le paquet à rechercher)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2654,11 +2627,11 @@ msgstr "NON SATISFAIT(E)"
 msgid "UNAVAILABLE"
 msgstr "INDISPONIBLE"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Étiquettes utilisateur"
 
@@ -2870,31 +2843,31 @@ msgstr ""
 "Ouverture en mode lecture seule : AUCUNE des modifications de l'état des "
 "paquets que vous pourrez faire ne sera conservée."
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr "étranger"
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr "même"
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr "autorisé"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "main"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr "contrib"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr "non-free"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr "non-US"
 
@@ -2977,37 +2950,45 @@ msgstr ""
 "Niveau de sûreté « %s » invalide (n'est ni « rejeter », ni « maximum »,  ni "
 "« minimum » ni un entier)."
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "Le cache des paquets n'est pas disponible ; impossible de télécharger et "
 "d'installer des paquets."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 "Erreur interne : impossible de créer la liste des paquets à télécharger"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "impossible de récupérer %s : %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Impossible de récupérer quelques archives, peut-être devrez-vous lancer "
+"aptitude update ou essayer avec --fix-missing ?"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Impossible d'effectuer une correction pour des paquets manquants"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Échec de l'installation d'un paquet. Tentative de réparation : "
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3159,13 +3140,13 @@ msgstr ""
 "\n"
 "Enregistrement terminé.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr "Accès à l'index"
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 msgid "Filtering packages"
 msgstr "Filtrage des paquets"
 
@@ -3278,18 +3259,18 @@ msgstr ""
 "Les fichiers d'index des paquets sont corrompus. Pas de champ « Filename » "
 "pour le paquet %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Journal des modifications de %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "Échec de téléchargement des journaux de modifications : %s"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 msgid "Failed to download changelogs: unexpected exception."
 msgstr ""
 "Échec de téléchargement des journaux de modifications : exception inattendue."
@@ -3348,25 +3329,26 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Analyse de la chaîne des paramètres de coût %s impossible"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Construction de la base de données des étiquettes"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr "ancien"
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 msgid "No tag descriptions are available."
 msgstr "Pas de description d'étiquette disponible."
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, c-format
 msgid "No description available for %s."
 msgstr "Pas de description disponible pour %s."
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr "ancien"
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3512,44 +3494,44 @@ msgstr "Gestionnaire de paquets Aptitude"
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr ""
 "Effectuer toutes les actions d'installation ou de suppression demandées"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Vérifier s'il existe de nouvelles versions des paquets"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Marquer pour mise à jour tous les paquets susceptibles d'être mis à jour et "
 "qui ne sont pas gelés"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Oublier quels paquets sont « nouveaux »"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Abandonner toutes les installations, suppressions, gels de paquets et mises "
 "à jour en attente"
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Effacer les fichiers de paquets précédemment téléchargés"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Effacer les fichiers des paquets qui ne peuvent plus être téléchargés"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Recharger le cache des paquets"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3559,7 +3541,7 @@ msgstr ""
 "Utilisez la commande « su » pour devenir administrateur. Cela relancera le "
 "programme mais vos préférences seront conservées"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Quitter le programme"
 
@@ -3567,7 +3549,7 @@ msgstr "Quitter le programme"
 msgid "E_dit"
 msgstr "_Édition"
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Annuler la dernière opération ou groupe d'opérations sur les paquets"
 
@@ -3600,7 +3582,7 @@ msgid "_Help"
 msgstr "_Aide"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr "Tableau noir"
 
@@ -3608,19 +3590,19 @@ msgstr "Tableau noir"
 msgid "Update"
 msgstr "_Mise à jour"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Paquets"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Aperçu"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Solutions"
 
@@ -3797,7 +3779,7 @@ msgid "Fix Manually"
 msgstr "Corriger manuellement"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Mettre à jour"
 
@@ -4333,11 +4315,11 @@ msgstr "Installé"
 msgid "Reinstall"
 msgstr "Réinstaller"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Réinstaller vers une version antérieure"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -4371,7 +4353,7 @@ msgstr ""
 msgid "Download already running."
 msgstr "Téléchargement déjà en cours."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Une mise à jour de la liste des paquets ou une installation est déjà en "
@@ -4443,41 +4425,41 @@ msgid "Asking whether to replace the configuration file %s"
 msgstr ""
 "Demande de confirmation pour le remplacement du fichier de configuration %s"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Téléchargement des paquets"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr "Paquets cassés"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr "Afficher les paquets cassés"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr "Résolution des dépendances"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "%d paquet est cassé"
 msgstr[1] "%d paquets sont cassés."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr "Afficher les modifications"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr "Mettre en Å“uvre les modifications"
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4487,60 +4469,60 @@ msgstr[1] " %d paquets à installer"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%d paquet à supprimer"
 msgstr[1] "%d paquets à supprimer"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr "Taille du téléchargement : %so"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr "Étiquettes de %s :\n"
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr "Cette fonctionnalité n'est pas encore opérationnelle."
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr "Non installé"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr "Installer/Mettre à jour"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr "_Purger"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Garder"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Geler"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr "Définir comme automatique"
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr "Définir comme manuel"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr "Changer l'état automatique"
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4577,7 +4559,7 @@ msgstr "Info"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4623,15 +4605,15 @@ msgstr "%s va être installé manuellement."
 msgid "Cache reloading, please wait..."
 msgstr "Rechargement du cache, veuillez patienter…"
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr "Recherche…"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr "Finalisation de la vue"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Construction de la vue"
@@ -5346,108 +5328,109 @@ msgstr "Type d'alignement inconnu « %s »"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "La règle de tri « %s » ne prend aucun paramètre"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Le nom d'une règle de tri ne peut avoir une longueur nulle"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "« ( » non fermée dans la description d'une règle de tri"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Type de règle de tri « %s » non valable"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Impossible de décoder la chaîne multi-octets après « %ls »"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Impossible de décoder une grande chaîne de caractères après « %s »"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilé le %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilateur : g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Compilé avec :\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  version d'APT : %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  version de NCurses : inconnue\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  version de NCurses : %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  version de libsigc++ : %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  gestion d'Ept activée.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  gestion d'Ept désactivée.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  Gtk+ version %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  Gtk-- version %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  prise en charge de Gtk+ désactivée.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "  Compilé avec Qt %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr "  Fonctionnant sous Qt %s\n"
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Prise en charge de Qt désactivée.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5455,32 +5438,32 @@ msgstr ""
 "\n"
 "versions des bibliothèques :\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  version de NCurses : %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  version de cwidget : %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  version d'APT : %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Utilisation : aptitude [-S NomFichier] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [options] <action> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5489,43 +5472,43 @@ msgstr ""
 "  Actions (si aucune n'est indiquée, aptitude entrera en mode interactif) :\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Installer/mettre à jour des paquets.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Supprimer des paquets.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge        - Supprimer des paquets et leurs fichiers de configuration.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Geler des paquets à une certaine version.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Annuler un gel de paquet.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Marquer les paquets comme automatiquement installés.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Marquer les paquets comme installés manuellement.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5534,18 +5517,18 @@ msgstr ""
 " forbid-version  - Interdire à aptitude la mise à jour vers une version\n"
 "                  spécifique de paquet.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr ""
 " update       - Télécharger les listes de paquets nouveaux/à mettre à jour.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Effectuer une mise à jour en toute sécurité.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5554,57 +5537,57 @@ msgstr ""
 " full-upgrade - Effectuer une mise à jour, en installant et supprimant\n"
 "                éventuellement des paquets.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 " build-dep    - Installer les dépendances de construction des paquets.\n"
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Oublier quels paquets sont « nouveaux ».\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr ""
 " search       - Rechercher des paquets en indiquant leur nom ou une\n"
 "                expression.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr ""
 " show         - Afficher les informations détaillées concernant un paquet.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " versions     - Affiche les versions des paquets spécifiés.\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Effacer les fichiers des paquets téléchargés.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr ""
 " autoclean    - Effacer les anciens fichiers des paquets téléchargés.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Voir le journal des modifications d'un paquet.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Télécharger le fichier .deb d'un paquet.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5613,7 +5596,7 @@ msgstr ""
 " reinstall    - Télécharger et (éventuellement) réinstaller un paquet déjà\n"
 "                installé.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5624,7 +5607,7 @@ msgstr ""
 "                d'un paquet, ou la raison pour laquelle un ou plusieurs\n"
 "                paquets auraient besoin d'un autre paquet.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5637,17 +5620,17 @@ msgstr ""
 "                pour laquelle un ou plusieurs paquets créeraient un\n"
 "                conflit si le paquet en question était installé.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr " Options :\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Afficher ce texte d'aide.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
@@ -5655,17 +5638,17 @@ msgstr ""
 " --gui          Utiliser l'interface GTK même si désactivée dans la\n"
 "                configuration.\n"
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr " --no-gui       Ne pas utiliser l'interface GTK même si disponible.\n"
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " --qt           Utiliser l'interface graphique Qt.\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
@@ -5673,12 +5656,12 @@ msgstr ""
 " --no-qt        Ne pas utiliser l'interface graphique Qt, même lorsqu'elle "
 "est                    activée dans la configuration.\n"
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simuler les actions, sans les effectuer réellement.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -5686,12 +5669,12 @@ msgstr ""
 " -d             Effectuer uniquement le téléchargement d'un paquet, sans\n"
 "                installer ou enlever quoi que ce soit.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Toujours demander confirmation pour les actions.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5699,7 +5682,7 @@ msgstr ""
 " -y             Supposer que la réponse à des questions oui/non est "
 "« oui ».\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5708,7 +5691,7 @@ msgstr ""
 " -F format      Indiquer un format pour l'affichage des résultats d'une\n"
 "                recherche ; voir le manuel.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5717,7 +5700,7 @@ msgstr ""
 " -O ordre       Indiquer comment les résultats d'une recherche doivent être\n"
 "                ordonnés ; voir le manuel.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
@@ -5725,19 +5708,19 @@ msgstr ""
 " -w largeur     Indiquer la largeur de l'affichage pour le formatage des\n"
 "                résultats d'une recherche.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Tenter de corriger de manière agressive les paquets cassés.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Afficher quelles versions des paquets vont être installées.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -5745,14 +5728,14 @@ msgstr ""
 " -D             Afficher les dépendances des paquets qui ont été modifiés\n"
 "                automatiquement.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 " -Z             Afficher la modification de la taille de chacun des paquets\n"
 "                après installation.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5761,7 +5744,7 @@ msgstr ""
 " -v             Afficher des informations supplémentaires (peut être\n"
 "                indiquée plusieurs fois).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
@@ -5769,7 +5752,7 @@ msgstr ""
 " -t [dist]      Indiquer la distribution pour laquelle le paquet doit être\n"
 "                installé.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5778,14 +5761,14 @@ msgstr ""
 " -q             En mode ligne de commande, supprimer l'indicateur\n"
 "                d'avancement.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o clé=valeur  Établir directement l'option de configuration appelée\n"
 "                « clé ».\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5794,80 +5777,80 @@ msgstr ""
 " --with(out)-recommends Préciser s'il faut ou non considérer les\n"
 "                        recommandations comme des dépendances fortes.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S nomfic      Lire les informations d'état étendu d'Aptitude à partir du\n"
 "                fichier nomfic.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr ""
 " -u             Télécharger les nouvelles listes de paquets au démarrage.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr "                  (interfaces texte seulement)\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr ""
 " -i             Effectuer une opération d'installation lors du démarrage.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                 Cet aptitude n'a pas de « Super Cow Powers ».\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 msgid "trace"
 msgstr "trace"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 msgid "debug"
 msgstr "debug"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:399
+#: src/main.cc:365
 msgid "info"
 msgstr "info"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 msgid "warn"
 msgstr "warn"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:405
+#: src/main.cc:371
 msgid "error"
 msgstr "error"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 msgid "fatal"
 msgstr "fatal"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr "off"
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
@@ -5876,48 +5859,28 @@ msgstr ""
 "Niveau de journalisation « %s » inconnu (attendu « trace », « debug », "
 "« info », « warn », « error », « fatal », or « off »)."
 
-#: src/main.cc:488
-#, c-format
-msgid "Invalid logger name \"%s\"."
-msgstr "Journaliser « %s » inconnu."
-
-#: src/main.cc:765
+#: src/main.cc:456
 #, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Un nombre est attendu après « -q= »\n"
+msgid "Invalid logger name \"%s\""
+msgstr "Journaliser « %s » inconnu"
 
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Un nombre est attendu après « -q= » alors que %s a été reçu\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o a besoin d'un paramètre de la forme clé=valeur (%s incorrect)\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Pas de virgule après le nom d'étiquette « %s ».\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "BIZARRERIE : un code d'option inconnu a été reçu\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr "--show-package-names|never"
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr "--show-package-names|auto"
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr "--show-package-names|always"
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
@@ -5926,29 +5889,29 @@ msgstr ""
 "Le mode d'affichage des paquets « %s » n'est pas licite (merci de choisir "
 "parmi « never », « auto », or « always »)."
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr "no-summary"
 
-#: src/main.cc:1027
+#: src/main.cc:781
 msgid "first-package"
 msgstr "first-package"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr "first-package-and-type"
 
-#: src/main.cc:1031
+#: src/main.cc:785
 msgid "all-packages"
 msgstr "all-packages"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr "all-packages-with-dep-versions"
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5959,38 +5922,41 @@ msgstr ""
 "« first-package », « first-package-and-type », « all-packages », ou « all-"
 "packages-with-dep-versions »."
 
-#: src/main.cc:1079
+#: src/main.cc:831
+#, fuzzy
+#| msgid ""
+#| "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may "
+#| "be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr ""
 "Seule une des options --auto-clean-on-startup, --clean-on-startup, -u et -i  "
 "peut être indiquée à la fois\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
+#, fuzzy
+#| msgid ""
+#| "-u, -i, and --clean-on-startup may not be specified in command-line mode "
+#| "(eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u, -i et --clean-on-startup ne peuvent pas être indiquées dans le mode "
 "ligne de commande (par exemple avec « install »)"
 
-#: src/main.cc:1105
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr ""
-"-u, -i et --clean-on-startup ne peuvent pas être indiquées avec une commande"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Commande inconnue « %s »\n"
+msgid "Unknown command \"%s\""
+msgstr "Commande inconnue « %s »"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Exception : %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -6008,7 +5974,7 @@ msgstr "Rechercher :"
 msgid "Search backwards for: "
 msgstr "Rechercher en arrière :"
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Démineur"
 
@@ -6225,7 +6191,7 @@ msgstr "Encodage de mine-help-fr.txt|ISO-8859-15"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Paquet"
 
@@ -6306,8 +6272,8 @@ msgstr "<N/A>"
 msgid "<none>"
 msgstr "<aucun>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtuel"
@@ -6443,7 +6409,7 @@ msgid "Internal error: Default column string is unparsable"
 msgstr ""
 "Erreur interne : la chaîne dans la colonne par défaut est incompréhensible"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Tâches"
 
@@ -6602,11 +6568,11 @@ msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 "Index de correspondance %ls trop grand ; les groupes disponibles sont (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PAQUETS NON ÉTIQUETÉS"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6617,10 +6583,6 @@ msgstr ""
 "données de debtags n'est pas disponible (l'installation du paquet debtags "
 "pourrait corriger ce problème)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "ÉTIQUETTE MANQUANTE"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Paquet source : "
@@ -7246,7 +7208,7 @@ msgstr " Chargement du cache"
 msgid "Really quit Aptitude?"
 msgstr "Voulez-vous vraiment quitter Aptitude ? "
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Modifier le comportement d'aptitude"
 
@@ -7329,7 +7291,7 @@ msgstr ""
 msgid "License"
 msgstr "Licence"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 "Afficher les termes selon lesquels vous pouvez copier et distribuer aptitude"
@@ -7351,7 +7313,7 @@ msgstr "Aide en ligne"
 msgid "View a brief introduction to aptitude"
 msgstr "Afficher une courte introduction à aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Aide"
 
@@ -7380,7 +7342,7 @@ msgstr "Manuel"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Afficher la liste des questions souvent posées"
 
@@ -7424,15 +7386,15 @@ msgstr ""
 "et tout ce qu'il contient ? Si vous répondez par la négative, cette question "
 "ne vous sera plus posée à l'avenir."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Visualiser l'avancement du téléchargement des paquets"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Téléchargement des paquets"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7444,35 +7406,35 @@ msgstr ""
 "sécurité de votre système%b. Vous ne devez poursuivre leur installation que "
 "si vous êtes certain de ce que vous faites."
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [version %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Vraiment continuer"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Abandonner l'installation"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Prévisualisation de l'installation des paquets"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Voir ou modifier les actions qui seront effectuées"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Certains paquets étaient cassés et ont été réparés :"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Il n'y a pas de solution à ce problème de dépendances !"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7481,7 +7443,7 @@ msgstr ""
 "Dépassement du temps imparti lors de la tentative de résolution des "
 "dépendances (appuyez sur « %s » pour refaire une tentative plus longue)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7490,19 +7452,19 @@ msgstr ""
 "d'administration que vous n'avez pas pour le moment. Voulez-vous devenir "
 "administrateur ?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Devenir superutilisateur"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Ne pas devenir superutilisateur"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Il n'est prévu d'installer, mettre à jour ou enlever aucun paquet."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7512,19 +7474,19 @@ msgstr ""
 "pourraient être mis à jour mais vous avez choisi de ne pas le faire. Entrez "
 "« U » pour préparer une mise à jour."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Mise à jour des listes de paquets"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Visualiser l'avancement de la mise à jour de la liste des paquets"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Mise à jour de la liste"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7532,24 +7494,24 @@ msgstr ""
 "La mise à jour des listes de paquets exige des droits d'administration que "
 "vous n'avez pas pour le moment. Voulez-vous devenir superutilisateur ?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Passer le temps en essayant de trouver les mines"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 "Le nettoyage n'est pas autorisé alors qu'un téléchargement est en cours"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Effacement des fichiers téléchargés"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Les fichiers téléchargés ont été effacés"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7557,12 +7519,12 @@ msgstr ""
 "Le nettoyage du cache des paquets exige des droits d'administration que vous "
 "n'avez pas pour le moment. Voulez-vous devenir administrateur ?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 "Le cache des paquets n'est pas disponible ; nettoyage automatique impossible."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7571,7 +7533,7 @@ msgstr ""
 "Les fichiers téléchargés de paquets périmés ont été effacés en libérant %so "
 "d'espace disque. "
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7579,124 +7541,124 @@ msgstr ""
 "La suppression des fichiers obsolètes exige des droits d'administration que "
 "vous n'avez pas pour le moment. Voulez-vous devenir administrateur ?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Pas d'autre solution."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Impossible de trouver une solution applicable."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Dépassement du temps imparti lors de la recherche d'une solution."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Résolution des dépendances"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Rechercher des solutions pour les dépendances non satisfaites"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Impossible d'ouvrir %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Erreur lors de l'écriture de l'état du solveur"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Installer/enlever des paquets"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Mettre à jour les listes de paquets"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Marquer comme étant susceptible de mise à ^jour"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Oublier quels paquets sont nouveaux"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Annu^ler les actions en attente"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Nettoyer le cache des paquets"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Enlever les fichiers ^périmés"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Recharger le cache des paquets"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "Jouer au ^démineur"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Devenir ^administrateur"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Quitter"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Annuler"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Installer"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "Marquer le paquet sélectionné comme étant à installer ou à mettre à jour"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Supprimer"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Marquer le paquet sélectionné comme étant à supprimer"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Purger"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Marquer le paquet sélectionné et ses fichiers de configuration comme étant à "
 "supprimer"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Garder"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Annuler toute action sur le paquet sélectionné"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "G^eler"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7704,11 +7666,11 @@ msgstr ""
 "Annuler toute action sur le paquet sélectionné et refuser toute mise à jour "
 "ultérieure"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Marquer ^automatique"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7716,11 +7678,11 @@ msgstr ""
 "Marquer le paquet choisi comme ayant été automatiquement installé ; il sera "
 "supprimé automatiquement si aucun autre paquet n'en dépend"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Marquer ^manuel"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7728,11 +7690,11 @@ msgstr ""
 "Marquer le paquet choisi comme ayant été installé manuellement ; il ne sera "
 "pas supprimé tant que vous ne le ferez pas vous-même"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Interdire version"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7740,19 +7702,19 @@ msgstr ""
 "Interdire d'installer la version proposée pour le paquet sélectionné ; les "
 "versions ultérieures du paquet seront normalement installées"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformation"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Afficher plus d'informations sur le paquet sélectionné"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "Circuler c^ycliquement dans l'information sur les paquets"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7763,95 +7725,95 @@ msgstr ""
 "son état de dépendances ou une analyse des raisons qui font que le paquet "
 "est requis."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "Liste des ^modifications"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 "Afficher la liste des modifications (« changelog ») du paquet sélectionné"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Examiner la solution"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 "Examiner la solution actuellement proposée pour le problème de dépendances."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "^Appliquer la solution"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Exécuter les actions contenues dans la solution actuellement proposée."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Solution suivante"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Choisir la solution suivante aux problèmes de dépendances."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "Solution ^précédente"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Choisir la solution précédente aux problèmes de dépendances."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^Première solution"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Choisir la première solution aux problèmes de dépendances."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "^Dernière solution"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "Choisir la dernière solution aux problèmes de dépendances."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Modifier l'état ^rejeté"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Modifier l'indication de rejet de l'action sélectionnée."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Modifier l'état ^approuvé"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Modifier l'indication d'approbation de l'action indiquée."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Afficher la cible"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Afficher le paquet qui sera affecté par l'action choisie"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Rejeter les non-respects de ^figeages"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7859,135 +7821,135 @@ msgstr ""
 "Rejeter toute action qui changerait l'état des paquets figés ou qui "
 "installerait des versions interdites"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Rechercher"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Rechercher en avant"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "Rechercher en ^arrière"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Rechercher en arrière"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Rechercher ^encore"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Recommencer la recherche précédente"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Poursuivre la recherche en ^arrière"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Recommencer la recherche précédente dans le sens opposé"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "Affichage ^restreint"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Filtrer la liste des paquets"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "Affichage ^complet"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Supprimer le filtre de la liste des paquets"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Rechercher ^cassés"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Rechercher le prochain paquet avec des dépendances non satisfaites"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Préférences"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "Options de l'interface ^utilisateur"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Modifier les paramètres qui affectent l'interface utilisateur"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Gestion des dépendances"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Changer les paramètres qui régissent la gestion des dépendances"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Divers"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Modifier divers paramètres du programme"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Revenir aux options par défaut"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Remettre tous les paramètres à leurs valeurs par défaut"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Suivant"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Affichage de l'écran suivant"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Précédent"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Affichage de l'écran précédant"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Fermer"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Fermer cet écran"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Nouvelle ^vue des paquets"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Créer une nouvelle vue par défaut des paquets"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Voir les ^recommandations"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7995,89 +7957,89 @@ msgstr ""
 "Afficher les paquets qu'il vous est recommandé d'installer, mais qui ne sont "
 "pas actuellement installés."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Nouvelle ^liste des paquets"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 "Afficher tous les paquets présents sur le système sous la forme d'une seule "
 "liste, sans catégorie"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Consultation par « ^Debtags »"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Parcourir les paquets en utilisant les données « Debtags »"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Consultation par ^catégories"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Parcourir les paquets par catégorie"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "À ^propos"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Afficher l'information à propos de ce programme"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Aide"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Afficher l'aide en ligne d'Aptitude"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Manuel Utilisateur"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Afficher le manuel d'utilisation détaillé"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Nouvelles"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Afficher les modifications importantes de chaque version de "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licence"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Actions"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Options"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Vues"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8086,11 +8048,11 @@ msgstr ""
 "%ls : Menu  %ls : Aide  %ls : Quitter  %ls : MAJ  %ls : Téléch./Install./"
 "Suppr. Paqts"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "o"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -8120,11 +8082,54 @@ msgstr ""
 msgid "Downloading the changelog of %s"
 msgstr "Téléchargement du fichier de suivi des modifications de %s"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr ""
-"Vous ne pouvez afficher les fichiers de suivi de modifications que pour les "
-"paquets Debian officiels."
+#~ msgid "MISSING TAG"
+#~ msgstr "ÉTIQUETTE MANQUANTE"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL d'où télécharger les journaux des modifications"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Cette option contrôle le patron utilisé pour télécharger les journaux des "
+#~ "modifications depuis le site web de Debian. Vous ne devriez avoir besoin "
+#~ "de le modifier que si l'adresse de téléchargement de ces journaux est "
+#~ "modifiée."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s n'est pas un paquet Debian officiel : il n'est pas possible d'afficher "
+#~ "le suivi des modifications (« changelog »)."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Impossible de trouver un paquet appelé « %s »"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Analyse du motif %s impossible"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Un nombre est attendu après « -q= »\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Un nombre est attendu après « -q= » alors que %s a été reçu\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o a besoin d'un paramètre de la forme clé=valeur (%s incorrect)\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "BIZARRERIE : un code d'option inconnu a été reçu\n"
+
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr ""
+#~ "-u, -i et --clean-on-startup ne peuvent pas être indiquées avec une "
+#~ "commande"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr ""
+#~ "Vous ne pouvez afficher les fichiers de suivi de modifications que pour "
+#~ "les paquets Debian officiels."
 
 #~ msgid "Err "
 #~ msgstr "Err "
diff --git a/po/gl.gmo b/po/gl.gmo
index cc72ab14..6ebeab1e 100644
--- a/po/gl.gmo
+++ b/po/gl.gmo
diff --git a/po/gl.po b/po/gl.po
index c17516bb..57da018b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:25+0800\n"
 "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -369,24 +369,10 @@ msgstr ""
 "arquivo de sources.list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL a empregar para descargar os rexistros de cambios"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Esta opción controla o patrón que se ha empregar para descargar os rexistros "
-"de cambios da páxina web de Debian. Só ha ter que cambialo se os rexistros "
-"de cambios se trasladan a un URL diferente."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Amosar o que se ha facer antes de facelo"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -394,13 +380,13 @@ msgstr ""
 "Se se activa esta opción, cando pida a aptitude que instale paquetes, antes "
 "ha amosar un resumo das accións que vai realizar."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 "Esquecer que paquetes son \"novos\" ao actualizar as listas de paquetes"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -408,12 +394,12 @@ msgstr ""
 "Se se activa esta opción, aptitude ha borrar a lista de paquetes novos "
 "despois de actualizar as listas de paquetes (por exemplo, premendo \"u\")."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Esquecer que paquetes son \"novos\" ao instalar ou eliminar paquetes"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -422,12 +408,12 @@ msgstr ""
 "Se se activa esta opción, aptitude ha borrar a lista de paquetes novos "
 "despois de instalar ou eliminar paquetes."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "Non amosar un aviso ao facer o primeiro cambio en modo de só lectura"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -436,12 +422,12 @@ msgstr ""
 "Se %Bnon%b se activa esta opción, aptitude ha amosar un aviso ao modificar o "
 "estado dun paquete se non ten permisos para aplicar o cambio ao sistema."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Avisar ao tentar facer unha operación privilexiada coma usuario non root"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -453,11 +439,11 @@ msgstr ""
 "administrador. Háselle dar a opción de se identificar coma administrador e "
 "realizar a acción con privilexios de administrador."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Ficheiro no que rexistrar as accións"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -469,11 +455,11 @@ msgstr ""
 "unha barra vertical (\"%B|%b\"), o resto do nome hase interpretar coma unha "
 "orde que vai recibir o rexistro na entrada estándar."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Resolver automaticamente as dependencias dun paquete ao seleccionalo"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -486,12 +472,12 @@ msgstr ""
 "incorporado, pero pode producir resultados non óptimos ou fallar "
 "completamente nalgúns casos."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Arranxar automaticamente os paquetes rotos antes de instalar ou eliminar"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -503,11 +489,11 @@ msgstr ""
 "resolvedor de problemas. Se non, aptitude halle pedir unha solución para as "
 "dependencias rotas."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Instalar automaticamente os paquetes recomendados"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -525,11 +511,11 @@ msgstr ""
 "paquetes que non se empregan\", non se han eliminar automaticamente os "
 "paquetes recomendados por un paquete instalado."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Eliminar automaticamente os paquetes que non se empregan"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -547,11 +533,11 @@ msgstr ""
 "paquetes recomendados\", non se han eliminar os paquetes instalados "
 "automaticamente se hai algún paquete instalado que os recomende."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Paquetes que nunca se deberían eliminar automaticamente"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -561,13 +547,13 @@ msgstr ""
 "un paquete instalado dependera deles; nunca se han eliminar coma paquetes "
 "sen usar."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Admitir as resolucións de dependencias que violan as retencións ou "
 "prohibicións de paquetes"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -590,15 +576,15 @@ msgstr ""
 "seleccionar para a súa instalación ou actualización, debido ao erro de apt "
 "número 470035."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Opcións de interface"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Xestión de dependencias"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Varios"
 
@@ -702,7 +688,7 @@ msgstr "Non se puido atopar o paquete fonte para \"%s\".\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Non se puideron satisfacer as dependencias de compilación: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -711,7 +697,7 @@ msgstr ""
 "Nota: \"%s\", que fornece o paquete virtual\n"
 "      \"%s\", xa está instalado.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -720,7 +706,7 @@ msgstr ""
 "Nota: \"%s\", que fornece o paquete virtual\n"
 "      \"%s\", xa se vai instalar.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -729,17 +715,22 @@ msgstr ""
 "\"%s\" existe na base de datos de paquetes, pero non é un\n"
 "paquete de verdade e ningún paquete o fornece.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" é un paquete virtual fornecido por:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Debe escoller un para instalar.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "O paquete «%s» non ten unha instalación candidata"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -748,64 +739,57 @@ msgstr ""
 "Nota: escóllese \"%s\" no canto do\n"
 "      paquete virtual \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s xa está instalado na versión solicitada (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 #| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s non está instalado agora, así que non se ha reinstalar.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 #| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s xa está instalado na versión solicitada (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s non está instalado agora, así que non se ha reinstalar.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "O paquete %s non está instalado, así que non se ha eliminar\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "O paquete %s non está instlado; non se pode impedir a actualización\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "O paquete %s non é actualizable; non se pode impedir a actualización\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Nota: escóllese a tarefa \"%s: %s\" para instalación\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Só se pode especificar unha versión dun paquete coas ordes \"install\" ou "
-"\"forbid-version\".\n"
+"\"forbid-version\""
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Só se pode especificar un arquivo de paquete coa orde \"install\".\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Só se pode especificar un arquivo de paquete coa orde \"install\""
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -814,7 +798,7 @@ msgstr ""
 "Non se puido atopar o paquete \"%s\", e hai máis de 40\n"
 "paquetes con \"%s\" nos seus nomes.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -823,13 +807,13 @@ msgstr ""
 "Non se puido atopar o paquete \"%s\". Nembargantes, os\n"
 "seguintes paquetes conteñen \"%s\" nos seus nomes:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Non atopou ningún paquete cun nome ou descrición que encaixen con \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -847,7 +831,7 @@ msgstr ""
 "Non se puido atopar ningún paquete que encaixe con \"%s\". Nembargantes,\n"
 "os seguintes paquetes conteñen \"%s\" na súa descrición:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Caracter de acción \"%c\" incorrecto\n"
@@ -872,7 +856,7 @@ msgstr "Err "
 msgid "Changelog download failed: %s"
 msgstr "Rexistro de cambios de %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "Non se puido executar \"sensible-pager\"; ¿é este un sistema Debian "
@@ -880,99 +864,82 @@ msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s non é un paquete Debian oficial; non se pode amosar o seu rexistro de "
-"cambios."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Non se puido atopar o rexistro de cambios de %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 #| msgid "Couldn't find a changelog for %s"
 msgid "Couldn't run pager %s"
 msgstr "Non se puido atopar o rexistro de cambios de %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: A orde \"clean\" non toma argumentos\n"
+msgid "The clean command takes no arguments"
+msgstr "A orde \"clean\" non toma argumentos"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Bor %s* %sparcial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 #| msgid "Unable to look up your home directory, saving to /tmp/function_pkgs!"
 msgid "Unable to lock the download directory"
 msgstr ""
 "Non se puido buscar o seu directorio persoal, grávase en /tmp/function_pkgs"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Bor %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: A orde \"autoclean\" non toma argumentos\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "A orde \"autoclean\" non toma argumentos"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Liberaría %sB de espazo no disco\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Liberáronse %sB de espazo no disco\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operación %s non válida"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Non se esperaba un argumento de patrón despois de \"keep-all\""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "Non se puideron resolver as dependencias dun xeito seguro, probe a executar "
-"con --full-resolver.\n"
+"con --full-resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Abortar.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "descarga: ten que especificar alomenos un paquete para descargar\n"
+msgid "download: you must specify at least one package to download"
+msgstr "descarga: ten que especificar alomenos un paquete para descargar"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Non se puido ler a lista de orixes"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Non se puido atopar un paquete chamado \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1014,22 +981,14 @@ msgid "[Working]"
 msgstr "[A traballar]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 "extract-cache-entries: precísase de alomenos un argumento (o directorio no "
-"que gravar os ficheiros).\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Non hai tal paquete \"%s\""
+"que gravar os ficheiros)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
@@ -1037,11 +996,10 @@ msgstr ""
 "que facer.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: A orde \"forget-new\" non toma argumentos\n"
+msgid "The forget-new command takes no arguments"
+msgstr "A orde \"forget-new\" non toma argumentos"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Esquecería que paquetes son novos\n"
@@ -1150,17 +1108,17 @@ msgstr "Os seguintes paquetes hanse actualizar:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Os seguintes paquetes parcialmente instalados hanse configurar:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "¡Os seguintes paquetes ESENCIAIS hanse ELIMINAR!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Os seguintes paquetes ESENCIAIS han ROMPER por esta acción:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1169,16 +1127,16 @@ msgstr ""
 "AVISO: ¡Ao realizar esta acción ha facer que o seu sistema rompa!\n"
 "       ¡NON continúe a menos que saiba EXACTAMENTE o que está a facer!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Son consciente de que esta é unha idea moi mala"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Para continuar, escriba a frase \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1195,7 +1153,7 @@ msgstr ""
 "facer.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1204,7 +1162,7 @@ msgstr ""
 "*** AVISO ***   Ignóranse estas violacións de confianza porque\n"
 "                %s::CmdLine::Ignore-Trust-Violations é 'true'\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1217,7 +1175,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1226,99 +1184,99 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "¿Quere ignorar este aviso e continuar igualmente?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "para continuar, introduza \"%s\"; para abortar, introduza \"%s\": "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Entrada non recoñecida. Introduza \"%s\" ou \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Os seguintes paquetes están RECOMENDADOS pero NON se han instalar:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Os seguintes paquetes están SUXIRIDOS pero NON se han instalar:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Non se ha instalar, actualizar ou eliminar ningún paquete.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paquetes actualizados, %lu instalados, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu desactualizados, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu hanse eliminar e %lu sen actualizar.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Hai que recibir %sB/%sB de arquivos. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Hai que recibir %sB de arquivos. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Despois de desempaquetar hanse ocupar %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Despois de desempaquetar hanse liberar %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Non hai paquetes que amosar -- introduza os nomes na liña despois de \"i\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Prema Intro para continuar."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Non se atopou ningún paquete -- introduza os nomes na liña despois de \"c"
 "\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1327,30 +1285,30 @@ msgstr ""
 "Non se atopou ningún paquete -- introduza cero ou máis raíces da busca "
 "seguidas polo paquete a xustificar.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "continuar coa instalación"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "abortar e saír"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1358,12 +1316,12 @@ msgstr ""
 "amosar información sobre un ou máis paquetes; os nomes deberían seguir o \"i"
 "\""
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1371,39 +1329,39 @@ msgstr ""
 "amosar os cambios en Debian de un ou máis paquetes; os nomes deberían seguir "
 "o \"c\""
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "amosar ou non a información de dependencias"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "amosar ou non os cambios nos tamaños dos paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "amosar ou non os números de versión"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1411,27 +1369,27 @@ msgstr ""
 "buscar un motivo para instalar un só paquete, ou explicar por qué instalar "
 "un paquete debería conlevar a instalación doutro paquete."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "executar o resolvedor automático de dependencias para arranxar as "
 "dependencias rotas."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "entrar na interface completamente visual"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1443,46 +1401,46 @@ msgstr ""
 "patróns). A acción hase aplicar a tódolos paquetes que liste. As seguintes "
 "accións están dispoñibles:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "\"+\" para instalar paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "\"+M\" para instalar paquetes e marcalos coma instalados automaticamente"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "\"-\" para eliminar paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "\"_\" para purgar paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "\"=\" para reter paquetes"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "\":\" para conservar os paquetes no seu estado actual sen os reter"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "\"&M\" para marcar paquetes coma instalados automaticamente"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "\"&m\" para marcar paquetes coma instalados manualmente"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "\"&BD\" para instalar as dependencias de compilación dun paquete."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1490,30 +1448,30 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 #| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "\"&M\" para marcar paquetes coma instalados automaticamente"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Ordes:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1521,20 +1479,20 @@ msgstr ""
 "aptitude non puido atopar unha solución para esas dependencias. Pode "
 "resolvelas á man ou premer \"n\" para saír."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "¿Quere continuar? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "¿Resolver estas dependencias á man? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Resposta non válida. Introduza unha orde válida ou \"?\" para obter axuda.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1543,7 +1501,7 @@ msgstr ""
 "un paquete), \"R\" para tentar a resolución automática de dependencais ou \"N"
 "\" para abortar."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1554,7 +1512,7 @@ msgstr ""
 "Hase amosar información sobre as dependencias.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1565,7 +1523,7 @@ msgstr ""
 "Non se ha amosar información sobre as dependencias.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1576,7 +1534,7 @@ msgstr ""
 "Hanse amosar as versións.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1587,7 +1545,7 @@ msgstr ""
 "Non se han amosar as versións.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1598,7 +1556,7 @@ msgstr ""
 "Hanse amosar os cambios de tamaño.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1744,6 +1702,11 @@ msgstr "Esperábase alomenos un par paquete/versión despois de \"%c\""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Esperábase unha versión ou \"%s\" despois de \"%s\""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Non hai tal paquete \"%s\""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1900,7 +1863,7 @@ msgstr ""
 "�anse resolver as dependencias, pero non se creou ningún resolvedor de "
 "dependencias."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1930,7 +1893,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "As seguintes ordes están dispoñibles:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Ficheiro no que gravar o estado do resolvedor: "
 
@@ -1963,7 +1926,7 @@ msgstr ""
 "*** ERRO: a busca quedou cancelada por unha excepción grave. Pode\n"
 "          seguir a buscar, pero non se han poder obter algunhas solucións."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1972,7 +1935,7 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 #| msgid "Unable to resolve dependencies for the upgrade (no solution found)."
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
@@ -1980,21 +1943,20 @@ msgstr ""
 "Non se puideron resolver as dependencias para a actualización (non se atopou "
 "unha solución)."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 #| msgid "Unable to resolve dependencies for the upgrade (%s)."
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Non se puideron resolver as dependencias para a actualización (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "Fallou a codificación de %s.\n"
+msgid "iconv of %s failed"
+msgstr "Fallou a codificación de %s"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "busca: Debe fornecer alomenos un termo de busca\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "busca: Debe fornecer alomenos un termo de busca"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2038,7 +2000,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Os seguintes paquetes teñen dependencias sen cumprir:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULO>"
@@ -2261,7 +2223,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Fornece"
 
@@ -2275,15 +2237,9 @@ msgstr "Descrición: "
 msgid "Homepage: "
 msgstr "Páxina web: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Non se puido atopar o paquete %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Non se puido analizar o patrón %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Non se atopou ningún paquete"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2294,14 +2250,13 @@ msgstr "Había descargar/instalar/eliminar paquetes.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Erro interno, a ordeación non rematou"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "A borrar os ficheiros descargados obsoletos"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: A orde \"update\" non toma argumentos\n"
+msgid "The update command takes no arguments"
+msgstr "A orde \"update\" non toma argumentos"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2320,137 +2275,159 @@ msgstr ""
 "%s: fornecéronse menos argumentos dos esperados; é preciso alomenos un nome "
 "de etiqueta e un paquete.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Non se atopou unha versión candidata para %s\n"
+msgid "No candidate version found for %s"
+msgstr "Non se atopou unha versión candidata para %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Non se atopou unha versión actual ou candidata para %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "Non se atopou unha versión actual ou candidata para %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Non se puido atopar un arquivo \"%s\" para o paquete \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Non se puido atopar un arquivo \"%s\" para o paquete \"%s\""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Non se puido atopar unha versión \"%s\" para o paquete \"%s\"\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Non se puido atopar unha versión \"%s\" para o paquete \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Erro interno: pasouse o valor non válido %i a cmdline_find_ver\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Erro interno: pasouse o valor non válido %i a cmdline_find_ver"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Non se poden especificar un arquivo e unha versión para un paquete\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Non se poden especificar un arquivo e unha versión para un paquete"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't find a changelog for %s"
-msgid "Couldn't find task '%s'"
-msgstr "Non se puido atopar o rexistro de cambios de %s"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d roto [%+d]"
 msgstr[1] "%d rotos [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d actualización [%+d]"
 msgstr[1] "%d actualizacións [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d novo [%+d]"
 msgstr[1] "%d novos [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Estado actual: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "Hai %d paquete recén feito obsoleto."
 msgstr[1] "Hai %d paquetes recén feitos obsoletos."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "Hai %d paquete recén feito obsoleto: "
 msgstr[1] "Hai %d paquetes recén feitos obsoletos: "
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Non hai unha coma tralo nome de etiqueta \"%s\""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Non se puido atopar o paquete %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find task '%s'"
+msgstr "Non se puido atopar o rexistro de cambios de %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Nota: escóllese a tarefa \"%s: %s\" para instalación\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Non se puido atopar o rexistro de cambios de %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 #| msgid "Packages"
 msgid "Package %s:"
 msgstr "Paquetes"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 #| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Paquete fonte: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 #| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Arquivo"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
 #| msgid "search: You must provide at least one search term\n"
-msgid "versions: You must provide at least one package selector\n"
+msgid "versions: You must provide at least one package selector"
 msgstr "busca: Debe fornecer alomenos un termo de busca\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2473,7 +2450,7 @@ msgstr "Actual"
 msgid "Candidate"
 msgstr "Candidato"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Instalar"
 
@@ -2577,22 +2554,19 @@ msgstr "Non se puido atopar un motivo para instalar %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Paquetes que dependen de %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Non existe ningún paquete chamado \"%s\"."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Non se puideron analizar algúns patróns de busca."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
-msgstr ""
-"%s: esta orde precisa de alomenos un argumento (o paquete a consultar).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
+msgstr "%s: esta orde precisa de alomenos un argumento (o paquete a consultar)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2619,11 +2593,11 @@ msgstr "SEN SATISFACER"
 msgid "UNAVAILABLE"
 msgstr "NON DISPOÑIBLES"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Etiquetas de Usuario"
 
@@ -2835,33 +2809,33 @@ msgstr ""
 "en modo de só lectura; NON se ha conservar ningún cambio que faga nos "
 "estados dos paquetes."
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 #| msgid "allow_choices"
 msgid "allowed"
 msgstr "permitir_eleccións"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "main"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2928,36 +2902,44 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "A caché de paquetes non está dispoñible; non se pode descargar e instalar "
 "paquetes."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Erro interno: non se puido xerar a lista de paquetes a descargar"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Non se puido descargar %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Non foi posíbel obter algúns arquivos; probe con aptitude update ou --fix-"
+"missing."
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Non se puido facer corrixir os paquetes non dispoñibles"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Non se puido instalar un paquete. Téntase recuperar:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3110,13 +3092,13 @@ msgstr ""
 "\n"
 "Rexistro completo.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 #| msgid "Downloading packages"
 msgid "Filtering packages"
@@ -3236,19 +3218,19 @@ msgstr ""
 "Os ficheiros de índices de paquetes están corrompidos. Non hai un campo "
 "Filename: para o paquete %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Rexistro de cambios de %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL a empregar para descargar os rexistros de cambios"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
@@ -3300,28 +3282,29 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Non se puido analizar o patrón %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "A construír a base de datos de etiquetas"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 #| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Sen instalar"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 #| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Sen instalar"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3484,43 +3467,43 @@ msgstr ""
 msgid "_File"
 msgstr "Falso"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Realizar tódalas instalacións e eliminacións pendentes"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Buscar novas versións dos paquetes"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Marcar tódolos paquetes actualizables que non están retidos para os "
 "actualizar"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Esquecer que paquetes son \"novos\""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Cancelar tódalas instalacións, eliminacións, retencións e actualizacións "
 "pendentes"
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Borrar os ficheiros con paquetes que se descargaron anteriormente"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Borrar os ficheiros de paquetes que xa non se poden descargar"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Recargar a caché de paquetes"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3530,7 +3513,7 @@ msgstr ""
 "Execute \"su\" para se facer administrador; isto ha reiniciar o programa, "
 "pero hase conservar a súa configuración"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Saír do programa"
 
@@ -3538,7 +3521,7 @@ msgstr "Saír do programa"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Desfacer a última operación ou grupo de operacións sobre os paquetes"
 
@@ -3575,7 +3558,7 @@ msgid "_Help"
 msgstr "Axuda"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3585,19 +3568,19 @@ msgstr ""
 msgid "Update"
 msgstr "Actualización das listas"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Paquetes"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Previsualización"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Resolvedor"
 
@@ -3804,7 +3787,7 @@ msgid "Fix Manually"
 msgstr "Manual"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Actualizar"
 
@@ -4402,11 +4385,11 @@ msgstr "Instalado"
 msgid "Reinstall"
 msgstr "Reinstalar"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Desactualizar"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -4446,7 +4429,7 @@ msgstr "Aplicar un filtro á lista de paquetes"
 msgid "Download already running."
 msgstr "A descargar..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Xa se está a realizar unha actualización de lista de paquetes ou instalación."
@@ -4515,29 +4498,29 @@ msgstr "Non hai paquetes rotos."
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Non se puido substituír %s co novo ficheiro de configuración"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "A descargar os paquetes"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Non hai paquetes rotos."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Non hai paquetes rotos."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 #| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Resolver dependencias"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 #| msgid "No packages are broken."
 msgid "%d package is broken"
@@ -4545,13 +4528,13 @@ msgid_plural "%d packages are broken."
 msgstr[0] "Non hai paquetes rotos."
 msgstr[1] "Non hai paquetes rotos."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 #| msgid "%s changes"
 msgid "View changes"
 msgstr "Cambios de %s"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 #| msgid "%s changes"
 msgid "Apply changes"
@@ -4560,7 +4543,7 @@ msgstr "Cambios de %s"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 #| msgid "%d install"
 #| msgid_plural "%d installs"
@@ -4572,7 +4555,7 @@ msgstr[1] "%d instalación"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 #| msgid "failed to remove %s"
 msgid "%d package to remove"
@@ -4580,62 +4563,62 @@ msgid_plural "%d packages to remove"
 msgstr[0] "non se puido eliminar %s"
 msgstr[1] "non se puido eliminar %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 #| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "TamDescarga"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 #| msgid "not installed"
 msgid "Not implemented"
 msgstr "sen instalar"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 #| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Instalado"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 #| msgid "^Purge"
 msgid "Purge"
 msgstr "^Purgar"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Conservar"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Reter"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 #| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Manual do usuario"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4680,7 +4663,7 @@ msgstr "non"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4731,19 +4714,19 @@ msgstr "%s; hase instalar automaticamente"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 #| msgid "Search"
 msgid "Searching..."
 msgstr "Busca"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 #| msgid "Building view"
 msgid "Finalizing view"
 msgstr "A construir a vista"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "A construir a vista"
@@ -5511,115 +5494,116 @@ msgstr "Tipo de aliñamento descoñecido \"%s\""
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 #| msgid "By-name sorting policies take no arguments"
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "As políticas de ordeación por nome non toman argumentos"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Nome de política de ordeación de lonxitude cero non válido"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Atopouse un \"(\" sen parella na descrición da política de ordeación"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Tipo de política de ordeación \"%s\" non válido"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Non se puido descodificar a cadea multibyte despois de \"%ls\""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 "Non se puiod descodificar a cadea de caracteres anchos despois de \"%s\""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilado en %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilador: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Compilado contra:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt versión %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  Versión de NCurses: Descoñecida\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  Versión de NCurses: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  Versión de libsigc++: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Soporte de ept activado.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Soporte de ept desactivado.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 #| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt versión %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 #| msgid "  apt version %d.%d.%d\n"
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt versión %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Soporte de ept desactivado.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 #| msgid "%s %s compiled at %s %s\n"
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s compilado en %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 #| msgid "  Ept support disabled.\n"
 msgid "  Qt support disabled.\n"
 msgstr "  Soporte de ept desactivado.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5627,32 +5611,32 @@ msgstr ""
 "\n"
 "Versións actuais das bibliotecas:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  Versión de NCurses: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  Versión de cwidget: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Versión de apt: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Emprego: aptitude [-S nomef] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "         aptitude [opcións] <acción> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5661,44 +5645,44 @@ msgstr ""
 "  Accións (se non se especifica ningunha, hase entrar en modo interactivo):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instalar/actualizar paquetes.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Eliminar paquetes.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge        - Eliminar paquetes e os seus ficheiros de configuración.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Reter paquetes.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Cancelar a retención dun paquete.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 " markauto     - Marcar paquetes coma se fosen instalados automaticamente.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Marcar paquetes coma se fose instalados manualmente.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5706,17 +5690,17 @@ msgid ""
 msgstr ""
 " forbid-version - Impedir que aptitude actualice un paquete a unha versión.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Descargar as listas de paquetes novos/actualizables.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Realizar unha actualización segura.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5725,54 +5709,54 @@ msgstr ""
 " full-upgrade - Facer unha actualización, quizais instalando e borrando "
 "paquetes.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 #| msgid "'&BD' to install the build-dependencies of a package."
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "\"&BD\" para instalar as dependencias de compilación dun paquete."
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Esquecer que paquetes son \"novos\".\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Buscar un paquete por nome e/ou expresión.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Amosar información detallada sobre un paquete.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Amosar información detallada sobre un paquete\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Borrar os ficheiros de paquetes descargados.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Borrar os ficheiros de paquetes descargados vellos.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Amosar o rexistro de cambios dun paquete.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Descargar o ficheiro .deb dun paquete.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5780,7 +5764,7 @@ msgid ""
 msgstr ""
 " reinstall    - Descargar e (tal vez) reinstalar un paquete xa instalado.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5791,7 +5775,7 @@ msgstr ""
 "                paquete, ou por que un ou máis paquetes habían requirir o\n"
 "                paquete indicado.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5804,57 +5788,57 @@ msgstr ""
 "                paquetes habían conducir a un conflicto co paquete indicado\n"
 "                se se instalaran.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opcións:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Este texto de axuda.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Este texto de axuda\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simular accións pero non realizalas.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Só descargar os paquetes, non instalar ou eliminar nada.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Pedir sempre confirmación para as accións.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5862,7 +5846,7 @@ msgstr ""
 " -y             Supoñer que a resposta ás preguntas simples de si/non é \"si"
 "\".\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5871,7 +5855,7 @@ msgstr ""
 " -F formato     Indicar un formato para os resultados das buscas; vexa o "
 "manual.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5880,24 +5864,24 @@ msgstr ""
 " -O orde        Indicar como ordear os resultados das buscas; vexa o "
 "manual.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr ""
 " -w anchura     Indicar a anchura para formatar os resultados das buscas.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Tentar arranxar de xeito agresivo os paquetes rotos.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Amosar as versións dos paquetes a instalar.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -5905,12 +5889,12 @@ msgstr ""
 " -D             Amosar as dependencias dos paquetes cambiados "
 "automaticamente.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z             Amosar o cambio no tamaño instalado de cada paquete.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5918,14 +5902,14 @@ msgid ""
 msgstr ""
 " -v             Amosar información extra (pode indicarse varias veces).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 " -t [distro]    Indicar de que distribución hai que instalar os paquetes.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5934,13 +5918,13 @@ msgstr ""
 " -q             No modo de liña de ordes, eliminar os indicadores de "
 "progreso.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o clave=valor  Establecer a opción de configuración chamada \"clave\".\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5949,27 +5933,27 @@ msgstr ""
 " --with(out)-recommends\tIndicar se hai que tratar as recomendacións coma\n"
 "                dependencias fortes.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S nomef       Ler a información de estado estendido de nomef.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Descargar novas listas de paquetes ao arrincar.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             Este texto de axuda\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Realizar unha instalación ao arrincar.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
@@ -5977,7 +5961,7 @@ 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:393
+#: src/main.cc:359
 #, fuzzy
 #| msgid "true"
 msgid "trace"
@@ -5985,13 +5969,13 @@ msgstr "verdadeiro"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 #| msgid "no"
 msgid "info"
@@ -5999,13 +5983,13 @@ msgstr "non"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 #| msgid "Err "
 msgid "error"
@@ -6013,7 +5997,7 @@ msgstr "Err "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 #| msgid "false"
 msgid "fatal"
@@ -6021,95 +6005,75 @@ msgstr "falso"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
 #| msgid "Invalid operation %s"
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Operación %s non válida"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Esperábase un número despois de -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Esperábase un número despois de -q=, recibiuse %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o precisa dun argumento da forma clave=valor, recibiuse %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Non hai unha coma tralo nome de etiqueta \"%s\".\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "COUSA RARA: recibiuse un código de opción descoñecido\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 #| msgid "Package"
 msgid "first-package"
 msgstr "Paquete"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 #| msgid "All Packages"
 msgid "all-packages"
 msgstr "Tódolos paquetes"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -6117,42 +6081,36 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 #| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Só se pode indicar un dos valores -u e -i\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 #| msgid ""
 #| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "Non se poden indicar -u e -i en modo de liña de comandos (p.ex. con \"install"
 "\")"
 
-#: src/main.cc:1105
-#, fuzzy
-#| msgid "-u and -i may not be specified with a command"
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "Non se poden indicar -u e -i cunha orde"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Orde \"%s\" descoñecida\n"
+msgid "Unknown command \"%s\""
+msgstr "Orde \"%s\" descoñecida"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Excepción sen capturar: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -6170,7 +6128,7 @@ msgstr "Buscar: "
 msgid "Search backwards for: "
 msgstr "Buscar cara a atrás: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Buscaminas"
 
@@ -6381,7 +6339,7 @@ msgstr "Codificación de mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 18 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Paquete"
 
@@ -6462,8 +6420,8 @@ msgstr "<N/D>"
 msgid "<none>"
 msgstr "<ningún>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtual"
@@ -6599,7 +6557,7 @@ msgstr ""
 msgid "Internal error: Default column string is unparsable"
 msgstr "Erro interno: A cadea de columnas por defecto non é analizable"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -6759,11 +6717,11 @@ msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 "O índice de coincidencia %ls é grande de máis; os grupos dispoñibles son (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PAQUETES SEN ETIQUETAR"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6774,10 +6732,6 @@ msgstr ""
 "de debtags non está presente (instalar debtags pode solucionar este "
 "problema)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "SEN ETIQUETA"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Paquete fonte: "
@@ -7409,7 +7363,7 @@ msgstr "A cargar a caché"
 msgid "Really quit Aptitude?"
 msgstr "¿Desexa saír de Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Cambiar o comportamento de aptitude"
 
@@ -7491,7 +7445,7 @@ msgstr ""
 msgid "License"
 msgstr "Licencia"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Ver os termos baixo os que pode copiar e distribuír aptitude"
 
@@ -7512,7 +7466,7 @@ msgstr "Axuda en liña"
 msgid "View a brief introduction to aptitude"
 msgstr "Ver unha breve introdución a aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Axuda"
 
@@ -7541,7 +7495,7 @@ msgstr "Manual"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Ver unha lista de preguntas frecuentes"
 
@@ -7584,15 +7538,15 @@ msgstr ""
 "¿Quere eliminar este directorio e o seu contido? Se escolle \"Non\", non ha "
 "volver ver esta mensaxe."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Ver o progreso da descarga dos paquetes"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Descarga dos paquetes"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7604,35 +7558,35 @@ msgstr ""
 "%b. Só debería continuar a instalación se está seguro de que é o que quere "
 "facer.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versión %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Continuar"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Abortar a instalación"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Previsualización da instalación dos paquetes"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Ver e/ou axustar as accións que se han realizar"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Había algúns paquetes rotos e arranxáronse:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "¡Non existe ningunha solución para estes problemas de dependencias!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7641,7 +7595,7 @@ msgstr ""
 "Esgotouse o tempo ao tentar resolver as dependencias (prema \"%s\" para "
 "seguir tentándoo)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7649,19 +7603,19 @@ msgstr ""
 "A instalación/eliminación de paquetes precisa de privilexios "
 "administrativos, que agora non ten. ¿Quere pasar á conta de administrador?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Facerse administrador"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Non se facer administrador"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Non hai ningún paquete para instalar, eliminar ou actualizar."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7671,19 +7625,19 @@ msgstr ""
 "podían actualizarse, pero non decidiu actualizalos. Prema \"U\" para "
 "preparar unha actualización."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "A actualizar as listas de paquetes"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Ver o progreso da actualización da lista de paquetes"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Actualización das listas"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7691,23 +7645,23 @@ msgstr ""
 "Actualizar as listas de paquetes precisa de privilexios administrativos, que "
 "agora non ten. ¿Quere pasar á conta de administrador?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Perder o tempo buscando minas"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Non se permite limpar durante unha descarga"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "A borrar os ficheiros descargados"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Borráronse os ficheiros de paquetes descargados"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7719,11 +7673,11 @@ msgstr ""
 "Actualizar as listas de paquetes precisa de privilexios administrativos, que "
 "agora non ten. ¿Quere pasar á conta de administrador?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "O ficheiro de caché de apt non está dispoñible; non se pode limpar."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7731,7 +7685,7 @@ msgid ""
 msgstr ""
 "Borráronse os ficheiros de paquetes obsoletos, e liberáronse %sB de disco."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7743,123 +7697,123 @@ msgstr ""
 "Actualizar as listas de paquetes precisa de privilexios administrativos, que "
 "agora non ten. ¿Quere pasar á conta de administrador?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Non hai máis solucións."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Non se puido atopar unha solución para aplicar."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Rematou o tempo ao buscar unha solución."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Resolver dependencias"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Buscar solucións ás dependencias non satisfeitas"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Non se puido abrir %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Erro ao verquer o estado do resolvedor"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Instalar/eliminar paquetes"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Actualizar a lista de paquetes"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "^Marcar os actualizables"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Esquecer os paquetes novos"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "^Cancelar as accións pendentes"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Limpar a caché de paquetes"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "^Borrar os ficheiros obsoletos"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Recargar a caché de paquetes"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Xogar ao Buscaminas"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^Facerse administrador"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Saír"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Desfacer"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Marcar o paquete seleccionado para o instalar ou actualizar"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Eliminar"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Marcar o paquete seleccionado para o eliminar"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Purgar"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Marcar o paquete seleccionado e os seus ficheiros de configuración para os "
 "eliminar"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Conservar"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Cancelar calquera acción sobre o paquete seleccionado"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Reter"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7867,11 +7821,11 @@ msgstr ""
 "Cancelar calquera acción sobre o paquete seleccionado, e protexelo contra "
 "futuras actualizacións"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Marcar ^auto"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7879,11 +7833,11 @@ msgstr ""
 "Marcar o paquete seleccionado coma instalado automaticamente; hase eliminar "
 "automaticamente se ningún outro paquete depende del"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Marcar ^manual"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7891,11 +7845,11 @@ msgstr ""
 "Marcar o paquete seleccionado coma instalado manualmente; non se ha eliminar "
 "a menos que o elimine a man"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "Pro^hibir versión"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7903,19 +7857,19 @@ msgstr ""
 "Impedir que a versión candidata do paquete seleccionado se instale; hanse "
 "instalar coma sempre versións posteriores do paquete"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformación"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Amosar máis información do paquete seleccionado"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "Mái^s información dos paquetes"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7925,59 +7879,59 @@ msgstr ""
 "a descrición longa do paquete, un resumo do estado das súas dependencias ou "
 "unha análise de por que o paquete é requirido."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Rexistro de cambios"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Amosar o rexistro de cambios de Debian do paquete seleccionado"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Examinar solución"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Examinar a solución seleccionada aos problemas de dependencias."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Ap^licar solución"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Realizar as accións contidas na solución seleccionada actualmente."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Seguinte solución"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Escoller a seguinte solución aos problemas de dependencias."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^Anterior solución"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Escoller a anterior solución aos problemas de dependencias."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^Primeira solución"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Escoller a primeira solución aos problemas de dependencias."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "^Derradeira solución"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7985,35 +7939,35 @@ msgstr ""
 "Escoller a derradeira solución xerada ata o momento aos problemas de "
 "dependencias."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Cambiar ^rexeitada"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Rexeitar ou volver aceptar a acción seleccionada actualmente."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "^Cambiar aprobada"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Aprobar ou desaprobar a acción seleccionada actualmente."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Ver obxectivo"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Ver o paquete afectado pola acción seleccionada"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Rexeitar se ^modifican retidos"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -8021,223 +7975,223 @@ msgstr ""
 "Rexeitar tódalas accións que cambiarían o estado dos paquetes retidos ou "
 "instalarían versións prohibidas"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Buscar"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Buscar"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "Buscar cara a ^atrás"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Buscar cara a atrás"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Buscar ^outro"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Repetir a última busca"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Buscar outro cara a ^atrás"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Repetir a última busca na dirección oposta"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Limitar vista"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Aplicar un filtro á lista de paquetes"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Deslimitar vista"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Quitar o filtro da lista de paquetes"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Buscar ^Rotos"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Buscar o seguinte paquete con dependencias sen satisfacer"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Preferencias"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^Opcións de interface"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Cambiar a configuración que afecta á interface de usuario"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Xestión de dependencias"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Cambiar a configuración que afecta ao xeito en que se xestionan as "
 "dependencias"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Varios"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Cambiar configuracións variadas do programa"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Desfacer cambios"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Voltar tódalas opcións aos valores do sistema por defecto"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Seguinte"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Ver a seguinte vista"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Anterior"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Ver a anterior vista"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Pechar"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Pechar esta vista"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Nova ^vista de paquetes"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Crear unha nova vista por defecto de paquetes"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Auditar as ^recomendacións"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr "Ver os paquetes non instalados dos que se recomenda a instalación."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Nova ^lista plana de paquetes"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Ver todos os paquetes do sistema nunha soa lista sen categorías"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Novo navegador de ^Debtags"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Ver os paquetes empregando os datos de Debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Novo ^navegador por categorías"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Ver os paquetes por categoría"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Acerca de"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Ver información deste programa"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "A^xuda"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Ver a axuda en liña"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Manual do usuario"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Ver o manual detallado do programa"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Novas"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Ver os cambios importantes en cada versión de "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licencia"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Accións"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Busca"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Opcións"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Vistas"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8246,11 +8200,11 @@ msgstr ""
 "%ls: Menú  %ls: Axuda  %ls: Saír  %ls: Actualizar  %ls: Descargar/Inst/Elim "
 "paquetes"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "s"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -8281,9 +8235,51 @@ msgstr "URL a empregar para descargar os rexistros de cambios"
 msgid "Downloading the changelog of %s"
 msgstr "A descargar o rexistro de cambios"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Só se poden ver rexistros de cambios de paquetes Debian oficiais."
+#~ msgid "MISSING TAG"
+#~ msgstr "SEN ETIQUETA"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL a empregar para descargar os rexistros de cambios"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Esta opción controla o patrón que se ha empregar para descargar os "
+#~ "rexistros de cambios da páxina web de Debian. Só ha ter que cambialo se "
+#~ "os rexistros de cambios se trasladan a un URL diferente."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s non é un paquete Debian oficial; non se pode amosar o seu rexistro de "
+#~ "cambios."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Non se puido atopar un paquete chamado \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Non se puido analizar o patrón %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Esperábase un número despois de -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Esperábase un número despois de -q=, recibiuse %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o precisa dun argumento da forma clave=valor, recibiuse %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "COUSA RARA: recibiuse un código de opción descoñecido\n"
+
+#, fuzzy
+#~| msgid "-u and -i may not be specified with a command"
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "Non se poden indicar -u e -i cunha orde"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Só se poden ver rexistros de cambios de paquetes Debian oficiais."
 
 #~ msgid "Err "
 #~ msgstr "Err "
@@ -8464,11 +8460,6 @@ msgstr "Só se poden ver rexistros de cambios de paquetes Debian oficiais."
 #~ msgstr "A descargar o rexistro de cambios"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Non se atopou unha solución."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Non se pode abrir o ficheiro de xerarquía de paquetes %s"
diff --git a/po/hr.gmo b/po/hr.gmo
index 1f020a66..a79b94c6 100644
--- a/po/hr.gmo
+++ b/po/hr.gmo
diff --git a/po/hr.po b/po/hr.po
index 5f87a9da..0f91776e 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:26+0800\n"
 "Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
 "Language-Team: Hrvatski <lokalizacija@linux.hr>\n"
@@ -364,24 +364,10 @@ msgstr ""
 "arhiva u sources.list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL korišten za preuzimanje popisa promjena"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Ova opcija kontrolira predložak koji se koristi za preuzimanje popisa "
-"promjena s Debian Web stranice.  Ovo biste trebali promijeniti samo ako su "
-"se popisi promjena pomaknuli na drugi URL."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Prikaži pregled što će se napraviti prije izvršavanja"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -389,12 +375,12 @@ msgstr ""
 "Ako je ova opcija omogućena, nakon što zatražite aptitude da izvrši "
 "instalaciju, prvo će prikazati sažetak radnji koje će izvršiti."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Zaboravi koji su paketi \"novi\" nakon ažuriranja popisa paketa"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -402,13 +388,13 @@ msgstr ""
 "Ako je ova opcija omogućena, aptitude će o�istiti popis novih paketa nakon "
 "ažuriranja popisa paketa (npr., ako pritisnete 'u')."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Zaboravi koji su paketi \"novi\" nakon instalacije ili uklanjanja paketa"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -418,14 +404,14 @@ msgstr ""
 "izvršavanja instalacije ili instalacije ili uklanjanja paketa iz naredbenog "
 "retka."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "Ne prikazuj upozorenje kad je prva promjena napravljena u na�inu samo za "
 "�itanje"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -435,11 +421,11 @@ msgstr ""
 "izmijenite stanje paketa ako nemate dozvole za primjenjivanje promjena na "
 "sustavu."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr "Upozori pri pokušaju izvršavanja ovlaštene radnje kao obi�an korisnik"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -451,11 +437,11 @@ msgstr ""
 "korisnik.  Dobit ćete mogućnost prijaviti se kao administrator i izvršiti "
 "radnju s administratorskim ovlastima."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Datoteka za spremanje dnevnika radnji"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -467,11 +453,11 @@ msgstr ""
 "('%B|%b'), ostatak imena će se interpretirati kao naredba ljuske kojoj će se "
 "proslijediti dnevnik na standardni ulaz."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Automatski riješi ovisnosti paketa pri odabiru"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -483,11 +469,11 @@ msgstr ""
 "Ovo je mnogo brže od ugrađenog algoritma za rješavanje ovisnosti, ali može "
 "stvoriti neoptimalne rezultate ili potpuni neuspjeh u nekim slu�ajevima."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "Automatski popravi slomljene pakete prije instalacije ili uklanjanja"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -499,11 +485,11 @@ msgstr ""
 "za rješavanje problema.  Ina�e, aptitude će vam ponuditi rješenje slomljenih "
 "ovisnosti."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Automatski instaliraj preporu�ene pakete"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -521,11 +507,11 @@ msgstr ""
 "pakete\", paketi koje preporu�uju instalirani paketi neće biti automatski "
 "uklonjeni."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Automatski ukloni nekorištene pakete"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -542,11 +528,11 @@ msgstr ""
 "pakete\", automatski instalirani paketi neće biti uklonjeni ako ih "
 "preporu�uje bilo koji instalirani paket."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Paketi koji nikad ne bi trebali biti automatski uklonjeni"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -556,11 +542,11 @@ msgstr ""
 "kao da instalirani paketi ovise o njima: oni nikad neće biti cilj uklanjanja "
 "nekorištenih paketa."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr "Dopusti rješavanje ovisnosti koje može slomiti zadržavanja ili zabrane"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -581,15 +567,15 @@ msgstr ""
 "instalaciji ovisnosti paketa koji je ozna�en za instalaciju ili nadogradnju, "
 "zbog apt greške #470035."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Opcije korisni�kog su�elja"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Rukovanje ovisnostima"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Razno"
 
@@ -698,7 +684,7 @@ msgstr "Ne mogu pronaći paket s izvornim kodom za \"%s\".\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Ne mogu zadovoljiti ovisnosti za izgradnju: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -707,7 +693,7 @@ msgstr ""
 "Napomena: \"%s\" koji pruža usluge virtualnog paketa\n"
 "          \"%s\" već je instaliran.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -716,7 +702,7 @@ msgstr ""
 "Napomena: \"%s\" koji pruža usluge virtualnog paketa\n"
 "          \"%s\" je već ozna�en za instalaciju.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -725,17 +711,23 @@ msgstr ""
 "\"%s\" postoji u bazi podataka paketa, ali nije stvarni\n"
 "paket i nijedan paket ne pruža njegove usluge.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" je virtualni paket �ije usluge pruža:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Morate odabrati jedan za instalaciju.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "Paket %s nije instaliran, ne mogu zabraniti nadogradnju\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -744,62 +736,55 @@ msgstr ""
 "Napomena: biram \"%s\" umjesto\n"
 "          virtualnog paketa \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "Već je instalirana zahtijevana ina�ica paketa %s (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s trenutno nije instaliran pa se neće nadograditi.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr ""
 "Već je instalirana posljednja ina�ica paketa %s pa se neće nadograditi.\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s nije trenutno instaliran pa se neće ponovo instalirati.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Paket %s nije instaliran pa se neće ukloniti\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Paket %s nije instaliran, ne mogu zabraniti nadogradnju\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Paket %s se ne može nadograditi, ne mogu zabraniti nadogradnju\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Napomena: biram instalaciju zadatka \"%s: %s\"\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
-"Ina�icu paketa možete navesti samo uz naredbe 'install' i 'forbid-version'.\n"
+"Ina�icu paketa možete navesti samo uz naredbe 'install' i 'forbid-version'"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Arhivu paketa možete navesti samo uz naredbu 'install'.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Arhivu paketa možete navesti samo uz naredbu 'install'"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -808,7 +793,7 @@ msgstr ""
 "Ne mogu pronaći paket \"%s\" i više od 40\n"
 "paketa sadrži \"%s\" u svom imenu.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -817,12 +802,12 @@ msgstr ""
 "Ne mogu pronaći paket \"%s\".  Međutim, sljedeći\n"
 "paketi sadrže \"%s\" u svom imenu:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Ne mogu pronaći nijedan paket �ije ime ili opis odgovara \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -840,7 +825,7 @@ msgstr ""
 "Ne mogu pronaći nijedan paket koji sadrži \"%s\".  Međutim, sljedeći\n"
 "paketi sadrže \"%s\" u svom opisu:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Krivi znak radnje '%c'\n"
@@ -862,98 +847,83 @@ msgstr "Greška"
 msgid "Changelog download failed: %s"
 msgstr "Preuzimanje popisa promjena nije uspjelo: %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Ne mogu izvršiti sensible-pager, je li ovo Debian sustav?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "%s nije službeni Debian paket, ne mogu prikazati popis promjena."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Ne mogu pronaći popis promjena za %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, c-format
 msgid "Couldn't run pager %s"
 msgstr "Ne mogu pokrenuti preglednik %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "G: Naredba clean ne prihvaća argumente\n"
+msgid "The clean command takes no arguments"
+msgstr "Naredba clean ne prihvaća argumente"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Brišem %s* %sdjelomi�no/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 msgid "Unable to lock the download directory"
 msgstr "Ne mogu zaklju�ati direktorij preuzimanja"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Brišem %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "G: Naredba autoclean ne prihvaća argumente\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Naredba autoclean ne prihvaća argumente"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Oslobodit će se %sB diskovnog prostora\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Oslobođeno %sB diskovnog prostora\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Neispravna operacija %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Neo�ekivani argument uzorka koji slijedi nakon \"keep-all\""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
-"Ne mogu sigurno riješiti ovisnosti, pokušajte pokrenuti s --full-resolver.\n"
+"Ne mogu sigurno riješiti ovisnosti, pokušajte pokrenuti s --full-resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Prekini.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "download: morate navesti barem jedan paket za preuzimanje\n"
+msgid "download: you must specify at least one package to download"
+msgstr "download: morate navesti barem jedan paket za preuzimanje"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Ne mogu �itati popis izvora"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Ne mogu pronaći paket imena \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -991,33 +961,24 @@ msgid "[Working]"
 msgstr "[Radim]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: potreban je barem jedan argument (direktorij u\n"
-"koji će se zapisati datoteke).\n"
+"extract-cache-entries: potreban je barem jedan argument (direktorij u koji "
+"će se zapisati datoteke)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Nema takvog paketa \"%s\""
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 "Nema paketa odabranih zadanim uzorkom pretraživanja; ništa za napraviti.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "G: Naredba forget-new ne prihvaća argumente\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Naredba forget-new ne prihvaća argumente"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Zaboravit će se koji su novi paketi\n"
@@ -1124,17 +1085,17 @@ msgstr "Sljedeći paketi će biti nadograđeni:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Sljedeći djelomi�no instalirani paketi će biti konfigurirani:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Sljedeći ESENCIJALNI paketi će biti UKLONJENI!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Sljedeći ESENCIJALNI paketi će biti SLOMLJENI ovom radnjom:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1143,16 +1104,16 @@ msgstr ""
 "UPOZORENJE: Izvršavanje ove radnje će vjerojatno slomiti sustav!\n"
 "            NEMOJTE nastavljati ako TOÄŒNO ne znate Å¡to radite!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Siguran sam da je ovo vrlo loša ideja"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Za nastavak, utipkajte frazu \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1169,7 +1130,7 @@ msgstr ""
 "to ono što stvarno želite.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1178,7 +1139,7 @@ msgstr ""
 "*** UPOZORENJE ***   Zanemarujem ova kršenja povjerenja jer je\n"
 "                     %s::CmdLine::Ignore-Trust-Violations 'true'!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1191,7 +1152,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr "Nastavi i zanemari upozorenja|Da"
 
@@ -1200,100 +1161,100 @@ msgstr "Nastavi i zanemari upozorenja|Da"
 #. 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr "Prekini umjesto zanemarivanja upozorenja|Ne"
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Želite li zanemariti ovo upozorenje i svejedno nastaviti?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Za nastavak, unesite \"%s\"; za prekid, unesite \"%s\": "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Neprepoznat unos.  Unesite \"%s\" ili \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Sljedeći su paketi PREPORUČENI ali NEĆE biti instalirani:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Sljedeći su paketi PREDLOŽENI ali NEĆE biti instalirani:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Nijedan paket neće biti instaliran, nadograđen ili uklonjen.\n"
 
 # množina!
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paketa nadograđeno, %lu novo instaliranih, "
 
 # množina!
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ponovo instaliranih, "
 
 # množina!
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu vraćenih na prethodnu ina�icu, "
 
 # množina!
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu za uklanjanje i %lu bez nadogradnje.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Moram preuzeti %sB/%sB arhiva. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Moram preuzeti %sB arhiva."
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Nakon otpakiranja zauzet će se %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Nakon otpakiranja oslobodit će se %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Nema paketa za prikaz -- unesite imena paketa u redak nakon 'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Pritisnite Return za nastavak."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Paketi nisu pronađeni -- unesite imena paketa u redak nakon 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1302,30 +1263,30 @@ msgstr ""
 "Paketi nisu pronađeni -- unesite nijedan ili više korijena pretrage nakon "
 "paketa za poravnanje.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "nastavi s instalacijom"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "prekini i izađi"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1333,12 +1294,12 @@ msgstr ""
 "prikaži informacije o jednom ili više paketa; navedite njihova imena nakon "
 "'i'"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1346,39 +1307,39 @@ msgstr ""
 "prikaži Debian popise promjena za jedan ili više paketa; navedite njihova "
 "imena nakon 'c'"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "promijeni prikaz informacija o ovisnostima"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "promijeni prikaz promjena u veli�inama paketa"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "promijeni prikaz brojeva ina�ica"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1386,26 +1347,26 @@ msgstr ""
 "pokušaj naći razlog za instalaciju jednog paketa ili objasni zašto "
 "instalacija jednog paketa vodi instalaciji drugog paketa."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "pokreni automatski rješava� ovisnosti za popravak slomljenih ovisnosti."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "uđi u potpuno vizualno su�elje"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1417,46 +1378,46 @@ msgstr ""
 "uzoraka).  Radnja će se primijeniti na sve pakete koje navedete.  Dostupne "
 "su sljedeće radnje:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' za instalaciju paketa"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M' za instalaciju paketa i ozna�avanje paketa kao automatski instaliranih"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' za uklanjanje paketa"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' za kompletno uklanjanje paketa"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' za zadržavanje paketa"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':' za ostavljanje paketa u trenutnom stanju bez zadržavanja"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' za ozna�avanje paketa kao automatski instaliranih"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' za ozna�avanje paketa kao ru�no instaliranih"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "'&BD' za instalaciju ovisnosti za izgradnju paketa."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1468,28 +1429,28 @@ msgstr ""
 "dodatne informacije o stanju paketa i mogu sadržavati bilo koju kombinaciju "
 "sljedećih znakova:"
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 msgid "'a': the package was automatically installed or removed."
 msgstr "'a': paket je automatski instaliran ili uklonjen."
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr "'b': neke od ovisnosti paketa su prekršene predloženim promjenama."
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr "'p': osim paketa bit će uklonjene i sve konfiguracijske datoteke."
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr "'u': paket će biti uklonjen jer se ne koristi."
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Naredbe:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1497,20 +1458,20 @@ msgstr ""
 "aptitude nije pronašao rješenje za ove ovisnosti.  Možete ih ru�no riješiti "
 "ili unesite 'n' za izlaz."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Želite li nastaviti? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Želite li ru�no riješiti ovisnosti? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Neispravan odgovor.  Molim unesite ispravnu naredbu ili '?' za pomoć.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1518,7 +1479,7 @@ msgstr ""
 "Unesite naredbu upravljanja paketima (kao Å¡to je '+ paket' za instalaciju "
 "paketa), 'R' za pokušaj automatskog rješavanja ovisnosti ili 'N' za prekid."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1529,7 +1490,7 @@ msgstr ""
 "Informacije o ovisnostima će biti prikazane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1540,7 +1501,7 @@ msgstr ""
 "Informacije o ovisnostima neće biti prikazane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1551,7 +1512,7 @@ msgstr ""
 "Ina�ice će biti prikazane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1562,7 +1523,7 @@ msgstr ""
 "Ina�ice neće biti prikazane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1573,7 +1534,7 @@ msgstr ""
 "Promjene veli�ine će biti prikazane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1708,6 +1669,11 @@ msgstr "O�ekujem barem jedan par paket/ina�ica nakon '%c'"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "O�ekujem ina�icu ili \"%s\" nakon \"%s\""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Nema takvog paketa \"%s\""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1869,7 +1835,7 @@ msgstr ""
 "Želim riješiti ovisnosti, ali nijedan algoritam za rješavanje ovisnosti nije "
 "stvoren."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1897,7 +1863,7 @@ msgstr "Napuštam automatsko rješavanje ovisnosti i vraćam na ru�no rješavan
 msgid "The following commands are available:"
 msgstr "Dostupne su sljedeće naredbe:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Datoteka za upis stanja algoritma za rješavanje: "
 
@@ -1931,7 +1897,7 @@ msgstr ""
 "*** GREŠKA: pretraga prekinuta fatalnom iznimkom.  Možete nastaviti\n"
 "            s pretraživanjem, ali neka rješenja neće biti dostupna."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1944,24 +1910,23 @@ msgstr ""
 "  Možda možete riješiti ovaj problem povećavanjem\n"
 "  Aptitude::ProblemResolver::StepLimit (trenutno %d)."
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Ne mogu riješiti ovisnosti za nadogradnju: nema pronađenih rješenja."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Ne mogu riješiti ovisnosti za nadogradnju: %s"
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "iconv %s nije uspio.\n"
+msgid "iconv of %s failed"
+msgstr "iconv %s nije uspio"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "search: Morate navesti barem jedan izraz za pretragu\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "search: Morate navesti barem jedan izraz za pretragu"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2004,7 +1969,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Sljedeći paketi imaju nezadovoljene ovisnosti:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2227,7 +2192,7 @@ msgid "Enhances"
 msgstr "Poboljšava"
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Pruža usluge"
 
@@ -2241,15 +2206,11 @@ msgstr "Opis: "
 msgid "Homepage: "
 msgstr "Po�etna stranica: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Ne mogu pronaći paket %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Ne mogu analizirati uzorak %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+#, fuzzy
+#| msgid "No packages are broken."
+msgid "No packages found"
+msgstr "Nema slomljenih paketa."
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2260,14 +2221,13 @@ msgstr "Preuzet/instalirat/uklonit ću sljedeće pakete.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Interna greška, raspoređivanje nije završilo"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Brišem zastarjele preuzete datoteke"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "G: Naredba update ne prihvaća argumente\n"
+msgid "The update command takes no arguments"
+msgstr "Naredba update ne prihvaća argumente"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2284,44 +2244,37 @@ msgstr "Uklanjam korisni�ku oznaku \"%s\" paketa \"%s\".\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr "%s: premalo argumenata; o�ekujem barem ime oznake i paket.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Nisu pronađene ina�ice kandidati za %s\n"
+msgid "No candidate version found for %s"
+msgstr "Nisu pronađene ina�ice kandidati za %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Nisu pronađene trenutne ili ina�ice kandidati za %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "Nisu pronađene trenutne ili ina�ice kandidati za %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Ne mogu pronaći arhivu \"%s\" za paket \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Ne mogu pronaći arhivu \"%s\" za paket \"%s\""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Ne mogu pronaći ina�icu \"%s\" za paket \"%s\"\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Ne mogu pronaći ina�icu \"%s\" za paket \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
 msgstr ""
-"Interna greška: neispravna vrijednost %i proslijeđena cmdline_find_ver!\n"
+"Interna greška: neispravna vrijednost %i proslijeđena cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Ne možete navesti i arhivu i ina�icu paketa\n"
-
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't run pager %s"
-msgid "Couldn't find task '%s'"
-msgstr "Ne mogu pokrenuti preglednik %s"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Ne možete navesti i arhivu i ina�icu paketa"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
@@ -2329,7 +2282,7 @@ msgstr[0] "%d slomljen [%+d]"
 msgstr[1] "%d slomljena [%+d]"
 msgstr[2] "%d slomljenih [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
@@ -2337,7 +2290,7 @@ msgstr[0] "%d ažuriran [%+d]"
 msgstr[1] "%d ažurirana [%+d]"
 msgstr[2] "%d ažuriranih [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
@@ -2345,12 +2298,12 @@ msgstr[0] "%d novi [%+d]"
 msgstr[1] "%d nova [%+d]"
 msgstr[2] "%d novih [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Trenutno stanje: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
@@ -2358,7 +2311,7 @@ msgstr[0] "Postoji %d novi zastarjeli paket."
 msgstr[1] "Postoje %d nova zastarjela paketa."
 msgstr[2] "Postoji %d novih zastarjelih paketa."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
@@ -2366,48 +2319,77 @@ msgstr[0] "Postoji %d novi zastarjeli paket:"
 msgstr[1] "Postoje %d nova zastarjela paketa:"
 msgstr[2] "Postoji %d novih zastarjelih paketa:"
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Nema zareza nakon oznake imena \"%s\""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ne mogu pronaći paket %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't run pager %s"
+msgid "Couldn't find task '%s'"
+msgstr "Ne mogu pokrenuti preglednik %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Napomena: biram instalaciju zadatka \"%s: %s\"\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Ne mogu pronaći popis promjena za %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, c-format
 msgid "Package %s:"
 msgstr "Paket %s:"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, c-format
 msgid "Source package %s:"
 msgstr "Paket koda %s:"
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, c-format
 msgid "Archive %s:"
 msgstr "Arhiva %s:"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr "--group-by|archive"
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr "--group-by|auto"
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr "--group-by|none"
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr "--group-by|package"
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr "--group-by|source-package"
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr "--group-by|source-version"
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
@@ -2416,10 +2398,9 @@ msgstr ""
 "Neispravan na�in grupiranja paketa \"%s\" (treba biti \"auto\", \"none\", "
 "\"package\" ili \"source-package\")"
 
-#: src/cmdline/cmdline_versions.cc:584
-#, c-format
-msgid "versions: You must provide at least one package selector\n"
-msgstr "versions: Morate navesti barem jedan izbornik paketa\n"
+#: src/cmdline/cmdline_versions.cc:578
+msgid "versions: You must provide at least one package selector"
+msgstr "versions: Morate navesti barem jedan izbornik paketa"
 
 #: src/cmdline/cmdline_why.cc:290
 msgid "dep_level"
@@ -2441,7 +2422,7 @@ msgstr "Trenutna"
 msgid "Candidate"
 msgstr "Kandidat"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Instaliraj"
 
@@ -2543,21 +2524,19 @@ msgstr "Ne mogu pronaći razlog za instalaciju %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Paketi koji zahtijevaju %s:"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Paket imena \"%s\" ne postoji."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Ne mogu analizirati neke uzorke podudaranja."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
-msgstr "%s: ova naredba zahtijeva barem jedan argument (paket za upit).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
+msgstr "%s: ova naredba zahtijeva barem jedan argument (paket za upit)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2583,11 +2562,11 @@ msgstr "NEZADOVOLJEN"
 msgid "UNAVAILABLE"
 msgstr "NEDOSTUPAN"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Oznake"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Korisni�ke oznake"
 
@@ -2792,31 +2771,31 @@ msgstr ""
 "alat već instalira pakete.  Otvaram u na�inu samo za �itanje; nijedna "
 "promjena stanja paketa NEĆE biti o�uvana!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr "strani"
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr "isti"
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr "dozvoljeni"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "main"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr "contrib"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr "non-free"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr "non-US"
 
@@ -2892,34 +2871,40 @@ msgstr ""
 "Neispravna razina sigurnosti \"%s\" (nije \"discard\", \"maximum\", \"minimum"
 "\" ili cijeli broj)."
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr "Spremnik paketa nije dostupan; ne mogu preuzeti i instalirati pakete."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Interna greška: ne mogu stvoriti popis paketa za preuzimanje"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Nisam uspio dohvatiti %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Ne mogu popraviti za nedostupne pakete"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Instalacija paketa nije uspjela.  Pokušavam oporavak:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3074,13 +3059,13 @@ msgstr ""
 "\n"
 "Zapisivanje gotovo.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr "Pristupam indeksu"
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 msgid "Filtering packages"
 msgstr "Filtriram pakete"
 
@@ -3191,18 +3176,18 @@ msgid ""
 msgstr ""
 "Datoteke indeksa paketa su pokvarene. Nema polja `Ime datoteke:' za paket %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Popis promjena za %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "Nisam uspio preuzeti popise promjena: %s"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Nisam uspio preuzeti popise promjena: neo�ekivana iznimka."
 
@@ -3250,25 +3235,26 @@ msgstr "Ne mogu stvoriti izlaznu datoteku: dijete je izašlo sa stanjem %d."
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nisam uspio analizirati niz postavki cijene: %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Stvaram bazu podataka oznaka"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr "stari"
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 msgid "No tag descriptions are available."
 msgstr "Nema dostupnih opisa oznaka."
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, c-format
 msgid "No description available for %s."
 msgstr "Nema dostupnih opisa za %s."
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr "stari"
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3411,40 +3397,40 @@ msgstr "Aptitude upravitelj paketa"
 msgid "_File"
 msgstr "_Datoteka"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Izvrši sve trenutne instalacije i uklanjanja"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Provjeri postoje li nove ina�ice paketa"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Ozna�i za nadogradnju sve dostupne pakete koji nisu zadržani"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Zaboravi koji su \"novi\" paketi"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Otkaži sve trenutne instalacije, uklanjanja, zadržavanja i nadogradnje."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Izbriši datoteke paketa koje su prethodno preuzete"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Izbriši datoteke paketa koje se više ne mogu preuzeti"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Ponovo u�itaj spremnik paketa"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3454,7 +3440,7 @@ msgstr ""
 "Pokreni 'su' za administratorske ovlasti; ovo će ponovo pokrenuti program, "
 "ali će vaše postavke ostati o�uvane"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Izađi iz programa"
 
@@ -3462,7 +3448,7 @@ msgstr "Izađi iz programa"
 msgid "E_dit"
 msgstr "Ure_di"
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Poništi zadnju operaciju na paketu ili grupu operacija"
 
@@ -3494,7 +3480,7 @@ msgid "_Help"
 msgstr "Po_moć"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr "Nadzorna plo�a"
 
@@ -3502,19 +3488,19 @@ msgstr "Nadzorna plo�a"
 msgid "Update"
 msgstr "Ažuriraj"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Paketi"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Pregled"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Rješavanje ovisnosti"
 
@@ -3689,7 +3675,7 @@ msgid "Fix Manually"
 msgstr "Ru�no popravi"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Nadogradi"
 
@@ -4224,11 +4210,11 @@ msgstr "Instaliran"
 msgid "Reinstall"
 msgstr "Ponovo instaliraj"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Vrati prethodnu ina�icu"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Ukloni"
 
@@ -4260,7 +4246,7 @@ msgstr "Morate biti root za ažuriranje popisa paketa."
 msgid "Download already running."
 msgstr "Preuzimanje je već pokrenuto."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Ažuriranje paketa ili instalacija je već u tijeku."
 
@@ -4327,23 +4313,23 @@ msgstr "Greška u paketu %s"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Pitam o zamjeni konfiguracijske datoteke %s"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Preuzimam pakete"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr "Slomljeni paketi"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr "Prikaži slomljene pakete"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr "Riješi ovisnosti"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
@@ -4351,18 +4337,18 @@ msgstr[0] "%d paket je slomljen."
 msgstr[1] "%d paketa su slomljena."
 msgstr[2] "%d paketa je slomljeno."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr "Pregledaj promjene"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr "Primijeni promjene"
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4373,7 +4359,7 @@ msgstr[2] "%d paketa za instalaciju"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
@@ -4381,53 +4367,53 @@ msgstr[0] "%d paket za uklanjanje"
 msgstr[1] "%d paketa za uklanjanje"
 msgstr[2] "%d paketa za uklanjanje"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr "Veli�ina preuzimanja: %sB."
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr "Oznake %s:\n"
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr "Ova zna�ajka još nije implementirana."
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr "Nije implementirano"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr "Instaliraj/Nadogradi"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr "Potpuno ukloni"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Ostavi"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Zadrži"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr "Postavi automatski"
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr "Postavi ru�no"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr "Promijeni automatsko stanje"
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4463,7 +4449,7 @@ msgstr "Informacije"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4507,15 +4493,15 @@ msgstr "%s se ru�no instalira."
 msgid "Cache reloading, please wait..."
 msgstr "Spremnik se ponovo u�itava, molim pri�ekajte..."
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr "Tražim..."
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr "Završavam pregled"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Gradim pregled"
@@ -5238,108 +5224,109 @@ msgstr "Nepoznata vrsta poravnanja '%s'"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Polica razvrstavanja '%s' ne prihvaća argumente"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Neispravno ime police razvrstavanja duljine nula"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Nesparena '(' u opisu police razvrstavanja"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Neispravna vrsta police razvrstavanja '%s'"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Ne mogu dekodirati višebajtni znakovni niz nakon \"%ls\""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Ne mogu dekodirati širokozna�ni znakovni niz nakon \"%s\""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s kompajliran na %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompajler: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Kompajlirano uz:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt ina�ica %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  NCurses ina�ica: nepoznato\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  NCurses ina�ica %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++ ina�ica: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Ept podrška omogućena.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Ept podrška onemogućena.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  Gtk+ ina�ica %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  Gtk-- ina�ica %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Gtk+ podrška onemogućena.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "  Kompajlirano s Qt %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr "  Izbvršava se na Qt %s\n"
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Qt podrška onemogućena.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5347,32 +5334,32 @@ msgstr ""
 "\n"
 "Trenutne ina�ice biblioteka:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  NCurses ina�ica: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  cwidget ina�ica: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Apt ina�ica: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Uporaba: aptitude [-S imedat] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opcije] <radnja> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5382,59 +5369,59 @@ msgstr ""
 "rada):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instaliraj/nadogradi pakete.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Ukloni pakete.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Ukloni pakete i njihove konfiguracijske datoteke.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Stavi pakete na zadržavanje.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Otkaži naredbu zadržavanja paketa.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Ozna�i pakete kao da su automatski instalirani.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Ozna�i pakete kao da su ru�no instalirani.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr " forbid-version - Zabrani nadogradnju na određenu ina�icu paketa.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Preuzmi popis novih/nadogradivih paketa.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Izvrši sigurnu nadogradnju.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5443,52 +5430,52 @@ msgstr ""
 " full-upgrade - Izvrši nadogradnju uz moguću instalaciju i uklanjanje "
 "paketa.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr " build-dep    - Instaliraj ovisnosti za izgradnju paketa.\n"
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Zaboravi koji su paketi \"novi\".\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Traži ime paketa ili opis.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Prikaži detaljne informacije o paketu.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " versions     - Prikaži ina�ice navedenog paketa.\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Izbriši preuzete datoteke paketa.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Izbriši stare preuzete datoteke paketa.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Pogledaj dnevnik promjena paketa.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Preuzmi .deb datoteku paketa.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5497,7 +5484,7 @@ msgstr ""
 " reinstall    - Preuzmi i (ako je moguće) ponovo instaliraj trenutno "
 "instaliran paket.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5507,7 +5494,7 @@ msgstr ""
 " why          - Prikaži ru�no instalirane pakete koji zahtijevaju paket ili\n"
 "                zašto jedan ili više paketa zahtijeva navedeni paket.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5519,66 +5506,66 @@ msgstr ""
 "                navedenim paketima ili zašto jedan ili više paketa vode\n"
 "                do sukoba s navedenim paketom u slu�aju instalacije.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opcije:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Ovaj tekst pomoći.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 " --gui          Koristi GTK grafi�ko su�elje �ak i ako nije konfigurirano.\n"
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 " --no-gui       Ne koristi GTK grafi�ko su�elje �ak i ako je dostupno.\n"
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " --qt           Koristi Qt grafi�ko su�elje.\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 " --no-qt        Ne koristi Qt grafi�ko su�elje �ak i ako je konfigurirano.\n"
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simuliraj radnje, ali ih ne izvršavaj.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Samo preuzmi pakete, nemoj ništa instalirati ili ukloniti.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Uvijek traži potvrdu radnji.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
 " -y             Pretpostavi da je odgovor na da/ne pitanja uvijek 'da'.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5587,7 +5574,7 @@ msgstr ""
 " -F format      Navedi oblik za prikaz rezultata pretrage; pogledajte "
 "priru�nik.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5596,36 +5583,36 @@ msgstr ""
 " -O order       Navedi na�in razvrstavanja rezultata pretrage; pogledajte "
 "priru�nik.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr ""
 " -w width       Navedi Å¡irinu prikaza oblikovanih rezultata pretrage.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Agresivno pokušaj popraviti slomljene pakete.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Prikaži ina�ice paketa koji će se instalirati.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             Prikaži ovisnosti automatski promijenjenih paketa.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 " -Z             Prikaži promjene u instaliranoj veli�ini svakog paketa.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5633,13 +5620,13 @@ msgid ""
 msgstr ""
 " -v             Prikaži dodatne informacije. (možete navesti više puta).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [release]   Postavi izdanje iz kojeg će paket biti instaliran.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5648,12 +5635,12 @@ msgstr ""
 " -q             U naredbenom retku izostavi indikatore inkrementalnog\n"
 "                napretka.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=val     Izravno postavi konfiguracijsku opciju imena 'key'.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5662,77 +5649,77 @@ msgstr ""
 " --with(out)-recommends\tNavedi hoće li se preporuke smatrati jakim\n"
 "                        ovisnostima.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fname       Pro�itaj podatke o aptitude proširenom stanju iz fname.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Preuzmi nove popise paketa pri pokretanju.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr "                  (samo terminalsko su�elje)\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Izvrši instalaciju pri pokretanju.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Ovaj aptitude nema moći Super Krave.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 msgid "trace"
 msgstr "prati"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 msgid "debug"
 msgstr "debug"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:399
+#: src/main.cc:365
 msgid "info"
 msgstr "informacije"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 msgid "warn"
 msgstr "upozorenje"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:405
+#: src/main.cc:371
 msgid "error"
 msgstr "greška"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 msgid "fatal"
 msgstr "fatalno"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr "isklju�eno"
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
@@ -5741,48 +5728,28 @@ msgstr ""
 "Nepoznato ime razine dnevnika \"%s\" (o�ekujem \"prati\", \"debug\", "
 "\"informacije\", \"upozorenje\", \"greška\", \"fatalno\" ili \"isklju�eno\")."
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, c-format
-msgid "Invalid logger name \"%s\"."
-msgstr "Neispravno ime zapisiva�a dnevnika \"%s\"."
+msgid "Invalid logger name \"%s\""
+msgstr "Neispravno ime zapisiva�a dnevnika \"%s\""
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "O�ekujem broj nakon -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "O�ekujem broj nakon -q=, dobio %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o zahtijeva argument u obliku klju�=vrijednost, dobio %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Nema zareza nakon oznake imena \"%s\".\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "ÄŒUDNO: primljen nepoznat opcijski kod\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr "--show-package-names|never"
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr "--show-package-names|auto"
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr "--show-package-names|always"
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
@@ -5791,29 +5758,29 @@ msgstr ""
 "Neispravan na�in prikaza imena paketa \"%s\" (treba biti \"never\", \"auto\" "
 "ili \"always\")."
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr "bez-sažetka"
 
-#: src/main.cc:1027
+#: src/main.cc:781
 msgid "first-package"
 msgstr "prvi-paket"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr "prvi-paket-i-vrsta"
 
-#: src/main.cc:1031
+#: src/main.cc:785
 msgid "all-packages"
 msgstr "svi-paketi"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr "svi-paketi-s-ina�icama-ovisnosti"
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5824,37 +5791,41 @@ msgstr ""
 "package\", \"first-package-and-type\", \"all-packages\" ili \"all-packages-"
 "with-dep-versions\"."
 
-#: src/main.cc:1079
+#: src/main.cc:831
+#, fuzzy
+#| msgid ""
+#| "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may "
+#| "be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr ""
 "Samo jedna od opcija --auto-clean-on-startup, --clean-on-startup, -i i -u "
 "može biti navedena\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
+#, fuzzy
+#| msgid ""
+#| "-u, -i, and --clean-on-startup may not be specified in command-line mode "
+#| "(eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u, -i i --clean-on-startup ne mogu biti navedene u naredbenom retku (npr. "
 "uz 'install')"
 
-#: src/main.cc:1105
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u, -i, and --clean-on-startup ne mogu biti navedene uz naredbu"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Nepoznata naredba \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Nepoznata naredba \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Neuhvaćena iznimka: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5872,7 +5843,7 @@ msgstr "Traži: "
 msgid "Search backwards for: "
 msgstr "Traži unatrag: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Čista� mina"
 
@@ -6081,7 +6052,7 @@ msgstr "Kodiranje mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 14 30 17 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Paket"
 
@@ -6162,8 +6133,8 @@ msgstr "<Nedostupno>"
 msgid "<none>"
 msgstr "<nijedan>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtualni"
@@ -6297,7 +6268,7 @@ msgstr "Ne mogu promijeniti kodiranje oblika prikaza paketa nakon \"%ls\""
 msgid "Internal error: Default column string is unparsable"
 msgstr "Interna greška: Zadani niz stupca se ne može analizirati"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Zadaci"
 
@@ -6452,11 +6423,11 @@ msgstr "Indeksi podudaranja moraju biti 1 ili veći, ne \"%s\""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "Indeks podudaranja %ls je prevelik; dostupne grupe su (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PAKETI BEZ OZNAKE"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6467,10 +6438,6 @@ msgstr ""
 "podataka nije prisutna (instalacija paketa debtags može popraviti ovaj "
 "problem)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "NEDOSTAJE OZNAKA"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Izvorni paket: "
@@ -7077,7 +7044,7 @@ msgstr "U�itavam spremnik"
 msgid "Really quit Aptitude?"
 msgstr "Želite li zaista zatvoriti Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Promijeni ponašanje programa aptitude"
 
@@ -7157,7 +7124,7 @@ msgstr ""
 msgid "License"
 msgstr "Licenca"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Pogledajte uvjete pod kojima smijete kopirati i distribuirati aptitude"
 
@@ -7178,7 +7145,7 @@ msgstr "Pomoć na webu"
 msgid "View a brief introduction to aptitude"
 msgstr "Pogledajte kratak uvod u aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Pomoć"
 
@@ -7207,7 +7174,7 @@ msgstr "Priru�nik"
 msgid "FAQ"
 msgstr "ÄŒPP"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Pogledajte popis �esto postavljanih pitanja"
 
@@ -7247,15 +7214,15 @@ msgstr ""
 "%nŽelite li ukloniti ovaj direktorij i sav njegov sadržaj?  Ako odaberete "
 "\"Ne\", više nećete vidjeti ovu poruku."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Pregledaj napredak preuzimanja paketa"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Preuzimanje paketa"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7267,35 +7234,35 @@ msgstr ""
 "Trebali biste nastaviti s instalacijom samo ako ste sigurni da to zaista "
 "želite.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [ina�ica %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Stvarno nastavi"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Prekini instalaciju"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Pregled instalacije paketa"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Pregledaj ili prilagodi radnje koje će se izvršiti"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Neki paketi su bili slomljeni i popravljeni su:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Ne postoji rješenje za ove probleme ovisnosti!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7304,7 +7271,7 @@ msgstr ""
 "Isteklo je vrijeme pri pokušaju rješavanja ovisnosti (pritisnite \"%s\" da "
 "se više potrudim)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7312,19 +7279,19 @@ msgstr ""
 "Instalacija/uklanjanje paketa zahtijeva administrativne ovlasti, koje "
 "trenutno nemate.  Želite li promijeniti u root korisni�ki ra�un?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Postani root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Nemoj postati root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Nema paketa određenih za instalaciju, uklanjanje ili nadogradnju."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7334,19 +7301,19 @@ msgstr ""
 "mogu nadograditi, ali ste odlu�ili ne u�initi to.  Pritisnite \"U\" za "
 "pripremu nadogradnje."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Ažuriram popis paketa"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Pogledaj napredak ažuriranja popisa paketa"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Ažuriranje popisa"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7354,23 +7321,23 @@ msgstr ""
 "Ažuriranje popisa paketa zahtijeva administrativne ovlasti, koje trenutno "
 "nemate.  Želite li promijeniti u root korisni�ki ra�un?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Ubijte vrijeme tražeći mine"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Čišćenje nije dozvoljeno dok je preuzimanje u tijeku"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Brišem preuzete datoteke"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Preuzete datoteke paketa su izbrisane"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7378,11 +7345,11 @@ msgstr ""
 "Čišćenje spremnika paketa zahtijeva administrativne ovlasti, koje trenutno "
 "nemate.  Želite li promijeniti u root korisni�ki ra�un?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "Datoteka apt spremnika nije dostupna; ne mogu izvršiti auto-clean."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7391,7 +7358,7 @@ msgstr ""
 "Zastarjele preuzete datoteke paketa su izbrisane, Å¡to je oslobodilo %sB "
 "prostora na disku."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7399,132 +7366,132 @@ msgstr ""
 "Brisanje zastarjelih datoteka zahtijeva administrativne ovlasti, koje "
 "trenutno nemate.  Želite li promijeniti u root korisni�ki ra�un?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Nema više rješenja."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Ne mogu naći rješenje za primjenu."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Isteklo je vrijeme pri traženju rješenja."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Riješi ovisnosti"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Traži rješenja nezadovoljenih ovisnosti"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Ne mogu otvoriti %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Greška ispisa stanja algoritma za rješavanje"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Instaliraj/ukloni pakete"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "Až^uriraj popis paketa"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Ozna�i za nado^gradnju"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Zaboravi nove pakete"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Otkaži radnj^e koje se izvršavaju"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "O�isti spremni^k paketa"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "^O�isti zastarjele pakete"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "Ponovo u�itaj sp^remnik paketa"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "Igra^j Čista�a mina"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Pos^tani root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Izađi"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Vrati"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Instaliraj"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Ozna�i trenutno odabran paket za instalaciju ili nadogradnju"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Ukloni"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Ozna�i trenutno odabran paket za uklanjanje"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Potpuno ukloni"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Ozna�i trenutno odabran paket i konfiguracijske datoteke za uklanjanje"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Ostavi"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Otkaži sve radnje na odabranom paketu"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Zadrži"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 "Otkaži sve radnje na odabranom paketu i zaštiti ga od budućih nadogradnji"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Ozna�i ^automatski"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7532,11 +7499,11 @@ msgstr ""
 "Ozna�i odabrani paket kao da je automatski instaliran; bit će automatski "
 "uklonjen ako nijedan paket ne ovisi o njemu"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Ozna�i ^ru�no"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7544,11 +7511,11 @@ msgstr ""
 "Ozna�i odabrani paket kao da je ru�no instaliran; neće biti uklonjen osim "
 "ako ga ru�no ne uklonite"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Zabrani ina�icu"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7556,19 +7523,19 @@ msgstr ""
 "Zabrani instalaciju ina�ice kandidata odabranog paketa; novije ina�ice "
 "paketa će biti instalirene kao i obi�no"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformacije"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Prikaži više informacija o odabranom paketu"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "^Kruži kroz informacije o paketu"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7578,93 +7545,93 @@ msgstr ""
 "duga�ak opis paketa, sažetak stanja njegovih ovisnosti ili analizu zašto je "
 "paket potreban."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Dnevnik promjena"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Prikaži Debian dnevnik promjena odabranog paketa"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "Pr^egledaj rješenja"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Pregledaj trenutno odabrano rješenje problema ovisnosti."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Primijeni ^Rješenje"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Izvrši radnje sadržane u trenutno odabranom rješenju."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "Sljedeće rješe^nje"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Odaberi sljedeće rješenje problema ovisnosti."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^Prethodno rješenje"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Odaberi prethodno rješenje problema ovisnosti."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "Prvo rješ^enje"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Odaberi prvo rješenje problema ovisnosti."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "Pos^ljednje rješenje"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "Odaberi posljednje rješenje problema ovisnosti stvoreno do sad."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "P^romijeni odbacivanje"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Promijeni oznaku odbacivanja odabrane radnje."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Promijeni prihv^aćeno"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Promijeni oznaku prihvaćanja odabrane radnje."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "Pregledaj me^tu"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Pregledaj pakete na koje će utjecati odabrane radnje"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Odbij lomljenje ^zadržavanja"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7672,135 +7639,135 @@ msgstr ""
 "Odbij sve radnje koje bi promijenile stanje zadržanih paketa ili instalirale "
 "zabranjene ina�ice"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Traži"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Traži prema naprijed"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "^Traži unatrag"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Traži prema natrag"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Tr^aži ponovo"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Ponovi zadnje traženje"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Traži ponovo ^unatrag"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Ponovi zadnje traženje u suprotnom smjeru"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "Ograni�i ^prikaz"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Primijeni filtar na popis paketa"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Ukloni granice prikaza"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Ukloni filtar s popisa paketa"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Nađi ^slomljene"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Nađi sljedeći paket s nezadovoljenim ovisnostima"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "O^pcije"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "Opcije s^u�elja"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Mijenja postavke koje utje�u na korisni�ko su�elje"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "Rukovanje ovisnos^tima"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Mijenja postavke koje utje�u na rukovanje ovisnostima"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "Raz^no"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Mijenja razne postavke programa"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "V^rati opcije"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Vraća sve postavke na zadane"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "S^ljedeći"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Pregledaj sljedeći prikaz"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Prethodni"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Pregledaj prethodni prikaz"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Zatvori"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Zatvara ovaj prikaz"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "No^vi pregled paketa"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Napravi novi zadani pregled paketa"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "^Revidiraj preporuke"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7808,87 +7775,87 @@ msgstr ""
 "Pogledaj pakete �ija se instalacija preporu�uje, ali nisu trenutno "
 "instalirani."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Novi ^ravni popis paketa"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Pregledaj sve pakete sustava u jednom popisu bez kategorija"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Novi ^Debtags preglednik"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Pregledaj pakete korištenjem Debtags podataka"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Novi ^preglednik kategorija"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Pregledaj pakete po kategorijama"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^O programu"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Pogledajte informacije o ovom programu"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Pomoć"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Pogledajte pomoć"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "Korisni�ki pri^ru�nik"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Pogledajte detaljni programski priru�nik"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "Č^PP"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Novosti"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Pogledajte važne promjene napravljene u svakoj ina�ici "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licenca"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Radnje"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Traži"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Opcije"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Pogled"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7897,11 +7864,11 @@ msgstr ""
 "%ls: Izbornik  %ls: Pomoć  %ls: Izlaz  %ls: Ažuriraj  %ls: Preuzmi/"
 "Instaliraj/Ukloni Pakete"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "da_tipka"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "ne_tipka"
 
@@ -7929,9 +7896,47 @@ msgstr "Nisam uspio preuzeti dnevnik promjena %s: %s"
 msgid "Downloading the changelog of %s"
 msgstr "Preuzimam dnevnik promjena %s"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Možete pregledati samo dnevnike promjena službenih Debian paketa."
+#~ msgid "MISSING TAG"
+#~ msgstr "NEDOSTAJE OZNAKA"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL korišten za preuzimanje popisa promjena"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Ova opcija kontrolira predložak koji se koristi za preuzimanje popisa "
+#~ "promjena s Debian Web stranice.  Ovo biste trebali promijeniti samo ako "
+#~ "su se popisi promjena pomaknuli na drugi URL."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr "%s nije službeni Debian paket, ne mogu prikazati popis promjena."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Ne mogu pronaći paket imena \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Ne mogu analizirati uzorak %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "O�ekujem broj nakon -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "O�ekujem broj nakon -q=, dobio %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o zahtijeva argument u obliku klju�=vrijednost, dobio %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "ÄŒUDNO: primljen nepoznat opcijski kod\n"
+
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u, -i, and --clean-on-startup ne mogu biti navedene uz naredbu"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Možete pregledati samo dnevnike promjena službenih Debian paketa."
 
 #~ msgid "Err "
 #~ msgstr "Greška"
diff --git a/po/hu.gmo b/po/hu.gmo
index 76c21ffd..e7aff5d5 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index cdbc8211..f4e8434c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude_po_hu\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:26+0800\n"
 "Last-Translator: SZERV�C Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
@@ -311,68 +311,57 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL a módosításnaplók letöltéséhez"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Előnézet megjelenítése végrehajtás előtt"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Az \"új csomagok\" lista törlése a csomagnézet frissítésekor"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Az \"új csomagok\" lista törlése csomagok telepítésekor és eltávolításakor"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "Ne figyelmeztess az 1. írásvédett-módú változtatásnál"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Figyelmeztetés, ha rendszergazdai parancsot nem rendszergazda próbál kiadni"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -380,11 +369,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Naplófájl"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -392,11 +381,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Csomag kiválasztásakor a függőségek automatikus feloldása"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -404,11 +393,11 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "Törött csomagok automatikus kijavítása telepítés és eltávolítás előtt"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -416,12 +405,12 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 #, fuzzy
 msgid "Install recommended packages automatically"
 msgstr "Az Ajánlott csomagok automatikus telepítése"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -432,11 +421,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Használaton kívüli csomagok automatikus eltávolítása"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -447,22 +436,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -475,17 +464,17 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 #, fuzzy
 msgid "UI options"
 msgstr "^UI opciók"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 #, fuzzy
 msgid "Dependency handling"
 msgstr "^Függőség kezelés"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Vegyes"
 
@@ -590,7 +579,7 @@ msgstr "Nem találtam meg \"%s\" archívumot a(z) \"%s\" csomaghoz\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "\"%s\" fájljai nem listázhatók"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -599,7 +588,7 @@ msgstr ""
 "Megjegyzés: a(z) \"%s\", ami biztosítja a(z) \"%s\"\n"
 "            virtuális csomagot, már telepítve van.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -608,7 +597,7 @@ msgstr ""
 "Megjegyzés: a(z) \"%s\", ami biztosítja a(z) \"%s\"\n"
 "            virtuális csomagot, már ki van választva telepítésre.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -617,17 +606,22 @@ msgstr ""
 "A(z) \"%s\" benne van a csomagadatbázisban, de nem valódi\n"
 "csomag és semmilyen csomag sem biztosítja.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "A(z) \"%s\" virtuális csomag, amit biztosít:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "A telepítéshez ki kell választani valamit!\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "„%s� csomagnak nincs telepítésre jelölt verziója"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -636,66 +630,59 @@ msgstr ""
 "Megjegyzés: \"%s\" kiválasztása a(z) \"%s\"\n"
 "                   virtuális csomag helyett.\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "A(z) %s kívánt verziója (%s) már telepítve van.\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 #| msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "A(z) %s jelenleg nincs telepítve, így nem lesz újratelepítve.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 #| msgid "%s is already installed at the requested version (%s)\n"
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "A(z) %s kívánt verziója (%s) már telepítve van.\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "A(z) %s jelenleg nincs telepítve, így nem lesz újratelepítve.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "A(z) %s csomag nincs telepítve, így nem lesz eltávolítva.\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "A(z) %s csomag nincs telepítve, így nem lehet megtiltani a frissítését.\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "A(z) %s csomag nem frissíthető, úgyhogy nem lehet megtiltani a frissítését.\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Megjegyzés: \"%s: %s\" metacsomag kijelölése telepítésre\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Csak 'telepítés' vagy 'verzió tiltása' parancsnál lehet a csomag "
-"verziószámát is megválasztani.\n"
+"verziószámát is megválasztani"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Csomagarchívumot csak a 'telepítés' parancshoz lehet megadni.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Csomagarchívumot csak a 'telepítés' parancshoz lehet megadni"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -704,7 +691,7 @@ msgstr ""
 "Nem találtam \"%s\" nevű csomagot és több, mint 40\n"
 "csomag tartalmaz \"%s\" sztringet a nevében.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -713,12 +700,12 @@ msgstr ""
 "Nem találtam \"%s\" nevű csomagot, de az alábbi\n"
 "csomagok neve tartalmazza ezt: \"%s\":\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Nem találtam ehhez illeszkedő nevű vagy leírású csomagot: \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -736,7 +723,7 @@ msgstr ""
 "Nem találtam olyan csomagot, amire illeszkedne a(z) \"%s\",\n"
 "de a következő csomagok leírása tartalmazz \"%s\" sztringet:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Rossz műveleti karakter: '%c'\n"
@@ -761,31 +748,24 @@ msgstr "Hib "
 msgid "Changelog download failed: %s"
 msgstr "%s változásnaplója"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Nem tudom futtatni a sensible-pager-t. Ez egy működő Debian rendszer?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"A(z) %s nem hivatalos Debian csomag, így nem jeleníthető meg a "
-"változásnaplója."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Nem találom a(z) %s változásnaplóját. "
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 #| msgid "Couldn't find a changelog for %s"
 msgid "Couldn't run pager %s"
 msgstr "Nem találom a(z) %s változásnaplóját. "
 
 #: src/cmdline/cmdline_clean.cc:60
-#, fuzzy, c-format
-msgid "E: The clean command takes no arguments\n"
+#, fuzzy
+msgid "The clean command takes no arguments"
 msgstr "H: A frissítés parancs nem vár paramétereket\n"
 
 #: src/cmdline/cmdline_clean.cc:66
@@ -793,71 +773,64 @@ msgstr "H: A frissítés parancs nem vár paramétereket\n"
 msgid "Del %s* %spartial/*\n"
 msgstr "Eltávolítás %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 #| msgid "Unable to look up your home directory, saving to /tmp/function_pkgs!"
 msgid "Unable to lock the download directory"
 msgstr ""
 "Nem sikerült megtalálni a HOME könyvtárat, mentés a /tmp/function_pkgs-be!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Eltávolítás %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, fuzzy, c-format
-msgid "E: The autoclean command takes no arguments\n"
+#: src/cmdline/cmdline_clean.cc:127
+#, fuzzy
+msgid "The autoclean command takes no arguments"
 msgstr "H: A frissítés parancs nem vár paramétereket\n"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "%sB lemezterület fog felszabadulni\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "%sB lemezterület szabadult föl\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Érvénytelen művelet: %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Váratlan minta argumentum a \"keep-all\" után"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, fuzzy, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+#, fuzzy
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr "Nem sikerült feloldani a függőségeket."
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Megszakítás.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "letöltés: legalább egy csomagot ki kell választani letöltésre\n"
+msgid "download: you must specify at least one package to download"
+msgstr "letöltés: legalább egy csomagot ki kell választani letöltésre"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "A forráslista olvasása sikertelen"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Nem találtam \"%s\" nevű csomagot"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -902,30 +875,22 @@ msgid "[Working]"
 msgstr " [Folyamatban]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Nincs \"%s\" nevű csomag"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, fuzzy, c-format
-msgid "E: The forget-new command takes no arguments\n"
+#, fuzzy
+msgid "The forget-new command takes no arguments"
 msgstr "H: A frissítés parancs nem vár paramétereket\n"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Nem fogom megjegyezni, hogy mely csomagok újak\n"
@@ -1036,18 +1001,18 @@ msgstr "A következő csomagok lesznek frissítve:"
 msgid "The following partially installed packages will be configured:"
 msgstr "A következő csomagok lesznek frissítve:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "A következő LÉNYEGES csomagok EL lesznek T�VOL�TVA!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "A következő LÉNYEGES csomagok TÖRÖTTEK lesznek a művelet végrehajtása után:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1056,16 +1021,16 @@ msgstr ""
 "FIGYELEM: Ez a művelet a rendszer használhatatlanná válásához vezethet!\n"
 "          NE folytasd, ha nem tudod EGÉSZEN PONTOSAN, hogy mit csinálsz!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Tudatában vagyok, hogy ez egy nagyon rossz ötlet"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "A folytatáshoz gépeld be a \"%s\" mondatot:\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1082,7 +1047,7 @@ msgstr ""
 "Csak akkor folytasd a telepítést, ha biztos vagy benne, hogy ezt akarod.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1093,7 +1058,7 @@ msgstr ""
 "                         mivel a(z) %s::CmdLine::Ignore-Trust-Violations "
 "értéke igaz!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 #, fuzzy
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1109,7 +1074,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1118,129 +1083,129 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Folytatás a figyelmeztetés ellenére is?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "A folytatáshoz írd be a(z) \"%s\"-t; a megszakításhoz a \"%s\"-t: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Ismeretlen parancs.  Vagy a(z) \"%s\"-t vagy a \"%s\"-t írd be.\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "A következő csomagok AJ�NLOTTAK de NEM lesznek telepítve:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "A következő csomagok JAVASOLTAK de NEM lesznek telepítve:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Nem lesz telepítve, frissítve vagy eltávolítva semmilyen csomag.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu csomag fog frissülni, %lu csomag lesz újonnan telepítve, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu lesz újratelepítve, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu fog visszafejlesztődni"
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu lesz eltávolítva és %lu nem fog frissülni.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Az archívumból %sB/%sB letöltendő. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Az archívumból %sB letöltendő. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Kicsomagolás után %sB lesz elfoglalva.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "A kicsomagolás után %sB fog felszabadulni.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Nincs megjelenítendő csomag -- az 'i' utáni sorba kell a csomagneveket "
 "írni.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Folytatás a Return leütésével."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Nem találtam csomagokat -- a 'c' utáni sorba kell a csomagneveket írni.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "folytatás a telepítéssel"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "megszakítás és kilépés"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1248,12 +1213,12 @@ msgstr ""
 "információ megjelenítése egy vagy több csomagról; a csomagneveket az 'i' "
 "után kell beírni"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1261,63 +1226,63 @@ msgstr ""
 "egy vagy több csomag változásnaplójának megjelenítése; a csomagneveket a 'c' "
 "után kell beírni"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "függőségi információk megjelenítésének ki/bekapcsolása"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "a csomagméret változások megjelenítésének ki/bekapcsolása"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "a verziószámok megjelenítésének ki/bekapcsolása"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "belépés a felhasználói felületre"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1329,46 +1294,46 @@ msgstr ""
 "összes felsorolt csomagra végrehajtódik.  A következő műveletek közül lehet "
 "választani:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' csomag telepítése"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M' csomag telepítése és automatikusan telepítettként való megjelölése"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' csomag eltávolítása"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' csomag kisöprése"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' csomag frissítésének tiltása"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':' csomagok jelen állapotának megtartása visszafogásra jelölés nélkül"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' csomag megjelölése automatikusan telepítettként"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' csomag megjelölése manuálisan telepítettként"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1376,56 +1341,56 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 #| msgid "'&M' to mark packages as automatically installed"
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' csomag megjelölése automatikusan telepítettként"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Parancsok:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Folytatás? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Értelmezhetetlen válasz.  Kérlek írj be érvényes parancsot vagy '?'-et a "
 "súgóhoz.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1436,7 +1401,7 @@ msgstr ""
 "A függőségi információk meg fognak jelenni.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1447,7 +1412,7 @@ msgstr ""
 "A függőségi információk nem fognak megjelenni.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1458,7 +1423,7 @@ msgstr ""
 "A verziószámok meg fognak jelenni.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1469,7 +1434,7 @@ msgstr ""
 "A verziószámok nem fognak megjelenni.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1480,7 +1445,7 @@ msgstr ""
 "A méretváltozások meg fognak jelenni.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1614,6 +1579,11 @@ msgstr "A '%c' után legalább egy csomag/verzió párt meg kell adni."
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "A(z) \"%s\" után meg kell adni a verziót"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Nincs \"%s\" nevű csomag"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1766,7 +1736,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1794,7 +1764,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "A következő parancsok érhetők el:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Az ütközésfeloldó állapotának mentése ebbe a fájlba:"
 
@@ -1825,7 +1795,7 @@ msgid ""
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1834,25 +1804,24 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Nem tudom feloldani az ütközéseket!  Feladom..."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Nem sikerült feloldani a függőségeket."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "a(z) %s konvertálása sikertelen.\n"
+msgid "iconv of %s failed"
+msgstr "a(z) %s konvertálása sikertelen"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "keresés: Legalább egy keresési feltételt meg kell adni\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "keresés: Legalább egy keresési feltételt meg kell adni"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1897,7 +1866,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "A következő csomagoknak vannak nem teljesített függőségeik:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2122,7 +2091,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Biztosítja"
 
@@ -2136,15 +2105,9 @@ msgstr "Leírás:"
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nem találom a(z) %s csomagot"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Nem tudom elemezni a(z) %s mintát"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Nem találhatók csomagok"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2155,14 +2118,13 @@ msgstr "Csomagokat fogok letölteni/telepíteni/eltávolítani.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Belső hiba: A rendezés nem fejeződött be"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Elavult letöltött fájlok törlése"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "H: A frissítés parancs nem vár paramétereket\n"
+msgid "The update command takes no arguments"
+msgstr "A frissítés parancs nem vár paramétereket"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, fuzzy, c-format
@@ -2179,138 +2141,160 @@ msgstr "Nem találtam meg a(z) \"%s\" csomag \"%s\" verzióját\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Nem találtam meg a(z) %s megfelelő verzióját\n"
+msgid "No candidate version found for %s"
+msgstr "Nem találtam meg a(z) %s megfelelő verzióját"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Nem találtam %s jelen vagy jelölt verzióját\n"
+msgid "No current or candidate version found for %s"
+msgstr "Nem találtam %s jelen vagy jelölt verzióját"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Nem találtam meg \"%s\" archívumot a(z) \"%s\" csomaghoz\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Nem találtam meg \"%s\" archívumot a(z) \"%s\" csomaghoz"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Nem találtam meg a(z) \"%s\" csomag \"%s\" verzióját\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Nem találtam meg a(z) \"%s\" csomag \"%s\" verzióját"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Belső hiba: a(z) %i érvénytelen érték a cmdline_find_ver-hez!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Belső hiba: a(z) %i érvénytelen érték a cmdline_find_ver-hez!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
 msgstr ""
-"Nem lehet egyszerre archívumot és verziószámot is megadni egy csomaghoz\n"
+"Nem lehet egyszerre archívumot és verziószámot is megadni egy csomaghoz"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-#| msgid "Couldn't find a changelog for %s"
-msgid "Couldn't find task '%s'"
-msgstr "Nem találom a(z) %s változásnaplóját. "
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nem találom a(z) %s csomagot"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find task '%s'"
+msgstr "Nem találom a(z) %s változásnaplóját. "
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Megjegyzés: \"%s: %s\" metacsomag kijelölése telepítésre\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Nem találom a(z) %s változásnaplóját. "
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 #| msgid "Packages"
 msgid "Package %s:"
 msgstr "Csomagok"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 #| msgid "Source Package: "
 msgid "Source package %s:"
 msgstr "Forráscsomag: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 #| msgid "Archive"
 msgid "Archive %s:"
 msgstr "Archívum"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
 #| msgid "search: You must provide at least one search term\n"
-msgid "versions: You must provide at least one package selector\n"
+msgid "versions: You must provide at least one package selector"
 msgstr "keresés: Legalább egy keresési feltételt meg kell adni\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2336,7 +2320,7 @@ msgstr ""
 msgid "Candidate"
 msgstr "JelV"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Telepít"
 
@@ -2441,21 +2425,19 @@ msgstr "Nem találok alkalmazható megoldást"
 msgid "Packages requiring %s:"
 msgstr "%s-függő csomagok"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, fuzzy, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Nem találtam \"%s\" nevű csomagot"
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 #, fuzzy
 msgid "Unable to parse some match patterns."
 msgstr "Nem tudom elemezni a(z) %s mintát"
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 
 #: src/cmdline/cmdline_why.h:212
@@ -2483,11 +2465,11 @@ msgstr "TELJES�TETLEN"
 msgid "UNAVAILABLE"
 msgstr "NEM ELÉRHET�"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Tag-ek"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 #, fuzzy
 msgid "User Tags"
 msgstr "Tag-ek"
@@ -2694,31 +2676,31 @@ msgstr ""
 "Nem sikerült megnyitni a gyostár-fájlt.  Megnyitás csak olvasás módban, a "
 "csomagok állapotának SEMMILYEN változtatása NEM lesz megőrizve!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "fő"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2785,36 +2767,44 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "A csomaggyorstár nem elérhető; nem sikerült letölteni és telepíteni a "
 "csomagokat."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Belső hiba: nem sikerült a letöltendő csomagok listáját előállítani"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, fuzzy, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "nem sikerült átnevezni a(z) %s-t %s-re"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Nem lehet letölteni néhány archívumot. Próbálja futtatni az „aptitude "
+"update� parancsot, vagy használja a --fix-missing kapcsolót."
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Nem sikerült a nem elérhető csomagokhoz  javítást találni"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Nem sikerült telepíteni egy csomagot.  Helyreállítás megkisérlése:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2965,13 +2955,13 @@ msgstr ""
 "\n"
 "Napló kész.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 #| msgid "Downloading packages"
 msgid "Filtering packages"
@@ -3085,19 +3075,19 @@ msgstr ""
 "A csomagindexfájlok sérültek.  Nincs \"Filename\" (fájlnév) mező a(z) %s "
 "csomaghoz"
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "%s változásnaplója"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: %s"
 msgstr "URL a módosításnaplók letöltéséhez"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download changelogs: unexpected exception."
@@ -3148,28 +3138,29 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nem tudom elemezni a(z) %s mintát"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Tag adatbázis építése"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 #| msgid "Not Installed"
 msgid "No tag descriptions are available."
 msgstr "Nincs telepítve"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 #| msgid "Not Installed"
 msgid "No description available for %s."
 msgstr "Nincs telepítve"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3327,39 +3318,39 @@ msgstr ""
 msgid "_File"
 msgstr "Bezár"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Minden függőben lévő telepítés és eltávolítás végrehajtása"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Csomagok új verzióinak keresése"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Azon frissíthető csomagok megjelölése, amik nincsenek visszatartva"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Az \"új csomagok\" lista törlése"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "Minden függő telepítés, eltávolítás, fogás és frissítés törlése"
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "A korábban letöltött csomagfájlok törlése"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "A már nem letölthető csomagfájlok törlése"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "A csomaggyorstár újbóli beolvasása"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3369,7 +3360,7 @@ msgstr ""
 "Ha rendszergazdaként akarsz belépni, futtasd a 'su'-t; ez újraindítja a "
 "programot, de megőrződnek a beállításaid"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Kilépés a programból"
 
@@ -3377,7 +3368,7 @@ msgstr "Kilépés a programból"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Az utolsó csomagművelet vagy műveletcsoport visszavonása"
 
@@ -3414,7 +3405,7 @@ msgid "_Help"
 msgstr "Súgó"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3424,19 +3415,19 @@ msgstr ""
 msgid "Update"
 msgstr "Lista frissítés"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Csomagok"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Előnézet"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Ütközésfeloldó"
 
@@ -3641,7 +3632,7 @@ msgid "Fix Manually"
 msgstr "Kézikönyv"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Frissít"
 
@@ -4227,11 +4218,11 @@ msgstr "Telepített"
 msgid "Reinstall"
 msgstr "Újratelepít"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Visszafejleszt"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Eltávolít"
 
@@ -4269,7 +4260,7 @@ msgstr "Szűrőt alkalmaz a csomaglistára"
 msgid "Download already running."
 msgstr "Letöltés..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Már folyamatban van egy csomaglista frissítés vagy egy telepítés."
 
@@ -4337,29 +4328,29 @@ msgstr "Nincsenek törött csomagok."
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Nem sikerült a(z) %s-t az új beállítófájllal helyettesíteni"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Csomagok letöltése"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Broken packages"
 msgstr "Nincsenek törött csomagok."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 #| msgid "No broken packages."
 msgid "Show broken packages"
 msgstr "Nincsenek törött csomagok."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 #| msgid "Resolve Dependencies"
 msgid "Resolve dependencies"
 msgstr "Függőségek feloldása"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 #| msgid "No packages are broken."
 msgid "%d package is broken"
@@ -4367,13 +4358,13 @@ msgid_plural "%d packages are broken."
 msgstr[0] "Nincs törött csomag."
 msgstr[1] "Nincs törött csomag."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 #| msgid "%s changes"
 msgid "View changes"
 msgstr "%s változás"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 #| msgid "%s changes"
 msgid "Apply changes"
@@ -4382,7 +4373,7 @@ msgstr "%s változás"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 #| msgid "%d install"
 #| msgid_plural "%d installs"
@@ -4394,7 +4385,7 @@ msgstr[1] "%d telepítés"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 #| msgid "failed to remove %s"
 msgid "%d package to remove"
@@ -4402,62 +4393,62 @@ msgid_plural "%d packages to remove"
 msgstr[0] "nem siketült eltávolítani a(z) %s-t"
 msgstr[1] "nem siketült eltávolítani a(z) %s-t"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 #| msgid "DownloadSize"
 msgid "Download size: %sB."
 msgstr "LetöltésiMéret"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 #| msgid "not installed"
 msgid "Not implemented"
 msgstr "nincs telepítve"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 #| msgid "Installed"
 msgid "Install/Upgrade"
 msgstr "Telepített"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 #| msgid "^Purge"
 msgid "Purge"
 msgstr "Tör^lés"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Tart"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Visszafog"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 #| msgid "User's Manual"
 msgid "Set as manual"
 msgstr "Felhasználói kézikönyv"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4498,7 +4489,7 @@ msgstr "nem"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4549,19 +4540,19 @@ msgstr "%s; automatikusan telepítve lesz"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 #| msgid "Search"
 msgid "Searching..."
 msgstr "Keresés"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 #| msgid "Building view"
 msgid "Finalizing view"
 msgstr "Nézet készítése"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Nézet készítése"
@@ -5315,115 +5306,116 @@ msgstr "Ismeretlen igazítási típus: '%s'"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 #| msgid "By-name sorting policies take no arguments"
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "A név-alapú rendezőelvek nem várnak paramétert"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Érvénytelen 0-hosszú rendezőelv-név"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Bezáratlan '(' a rendezőelv leírásában"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Érvénytelen rendezőelv típus: '%s'"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Ismeretlen több-bájt füzér ezután: \"%ls\""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Nem sikerült dekódolni a széles karakterláncot a \"%s\" után"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s verziója lefordítva %s %s-kor\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Fordító: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 #, fuzzy
 msgid "Compiled against:\n"
 msgstr "Fordító: g++ %s\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, fuzzy, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "A(z) %F %s (%s) verzión tartása"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, fuzzy, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 "\n"
 "NCurses verzió: %s\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, fuzzy, c-format
 msgid "  NCurses version %s\n"
 msgstr ""
 "\n"
 "NCurses verzió: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, fuzzy, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "libsigc++ verzió: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "A(z) %F %s (%s) verzión tartása"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "A(z) %F %s (%s) verzión tartása"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 #| msgid "%s %s compiled at %s %s\n"
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s verziója lefordítva %s %s-kor\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:181
 #, fuzzy
 msgid ""
 "\n"
@@ -5432,36 +5424,36 @@ msgstr ""
 "\n"
 "Curses verzió: %s\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, fuzzy, c-format
 msgid "  NCurses version: %s\n"
 msgstr ""
 "\n"
 "NCurses verzió: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, fuzzy, c-format
 msgid "  cwidget version: %s\n"
 msgstr "libsigc++ verzió: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, fuzzy, c-format
 msgid "  Apt version: %s\n"
 msgstr ""
 "\n"
 "Curses verzió: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Használat: aptitude [-S fájlnév] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "           aptitude [opciók] <művelet> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5470,19 +5462,19 @@ msgstr ""
 "  Műveletek (ha egy sincs megadva, az aptitude interaktív módban indul):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, fuzzy, c-format
 #| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Csomagok telepítése/frissítése\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, fuzzy, c-format
 #| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Csomagok eltávolítása\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, fuzzy, c-format
 #| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
@@ -5490,50 +5482,50 @@ msgstr ""
 " purge        - Csomagok eltávolítása a hozzájuk tartozó beállítófájlokkal "
 "együtt\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, fuzzy, c-format
 #| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Csomagok jelenlegi állapotban tartása\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, fuzzy, c-format
 #| msgid " unhold       - Cancel a hold command for a package\n"
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Visszafogás parancs törlése egy csomagra\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, fuzzy, c-format
 #| msgid ""
 #| " markauto     - Mark packages as having been automatically installed\n"
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Csomagok megjelölése automatikusan telepítettként\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, fuzzy, c-format
 #| msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Csomagok megjelölése manuálisan telepítettként\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr " forbid-version - A megadott verzióra való frissítés tiltása\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, fuzzy, c-format
 #| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Az új/frissíthető csomagok listájának letöltése\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, fuzzy, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " upgrade      - Biztonságos frissítés elvégzése\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, fuzzy, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5542,60 +5534,60 @@ msgstr ""
 " dist-upgrade - Frissítés elvégzése, esetleg csomagok eltávolításával és "
 "törlésével együtt\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, fuzzy, c-format
 #| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Elfelejti, hogy mely csomagok  \"újak\"\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, fuzzy, c-format
 #| msgid " search       - Search for a package by name and/or expression\n"
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Csomag keresése név és/vagy kifejezés alapján\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Részletes információ megjelenítése a csomagokról\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Részletes információ megjelenítése a csomagokról\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, fuzzy, c-format
 #| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - A letöltött csomagfájlok törlése\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, fuzzy, c-format
 #| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - A régi letöltött csomagfájlok törlése\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, fuzzy, c-format
 #| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Csomag változásnaplójának megjelenítése\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, fuzzy, c-format
 #| msgid " download     - Download the .deb file for a package\n"
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Csomag .deb fájljának letöltése\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, fuzzy, c-format
 #| msgid ""
 #| " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5607,7 +5599,7 @@ msgstr ""
 " reinstall    - Egy már telepített csomag letöltése és (lehetőség szerint) "
 "újratelepítése\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, fuzzy, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5617,7 +5609,7 @@ msgstr ""
 " -Z             Minden telepített csomag méretbeli változásának "
 "megjelenítése\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, fuzzy, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5628,60 +5620,60 @@ msgstr ""
 " -Z             Minden telepített csomag méretbeli változásának "
 "megjelenítése\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opciók:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Ez a súgó\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Ez a súgó\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 " -s             Műveletek szimulálása a tényleges végrehajtásuk nélkül\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Csak csomagok letöltése telepítés vagy eltávolítás nélkül\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, fuzzy, c-format
 #| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Mindig kér megerősítést vagy művelet megadását\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, fuzzy, c-format
 #| msgid ""
 #| " -y             Assume that the answer to simple yes/no questions is "
@@ -5692,7 +5684,7 @@ msgstr ""
 " -y             Felteszi, hogy az egyszerű igen/nem kérdésekre 'igen' a "
 "válasz\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, fuzzy, c-format
 #| msgid ""
 #| " -F format      Specify a format for displaying search results; see the "
@@ -5704,7 +5696,7 @@ msgstr ""
 " -F formátum      Formátum megadása a keresési eredmények megjelenítéséhez; "
 "lásd a kézikönyvet\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, fuzzy, c-format
 #| msgid ""
 #| " -O order       Specify how search results should be sorted; see the "
@@ -5716,7 +5708,7 @@ msgstr ""
 " -O rendezés       Rendezési sorrend megadása a keresési eredményekhez; lásd "
 "a kézikönyvet\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, fuzzy, c-format
 #| msgid ""
 #| " -w width       Specify the display width for formatting search results\n"
@@ -5725,18 +5717,18 @@ msgid ""
 msgstr ""
 " -w szélesség       Szélesség megadása a keresési eredmények formázásához\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             A törött csomagok erőszakkal való javításának megkisérlése\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             A telepítendő csomagok verziójának megjelenítése\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -5744,14 +5736,14 @@ msgstr ""
 " -D             Az automatikusan változtatott csomagok függőségeinek "
 "megjelenítése\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 " -Z             Minden telepített csomag méretbeli változásának "
 "megjelenítése\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, fuzzy, c-format
 #| msgid ""
 #| " -v             Display extra information. (may be supplied multiple "
@@ -5763,7 +5755,7 @@ msgstr ""
 " -v             Plusz információ megjelenítése (többszörösen is "
 "alkalmazható)\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, fuzzy, c-format
 #| msgid ""
 #| " -t [release]   Set the release from which packages should be installed\n"
@@ -5772,7 +5764,7 @@ msgid ""
 msgstr ""
 " -t [kiadás]   A kiadás beállítása, amiből a csomagokat telepíteni kell\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, fuzzy, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5780,14 +5772,14 @@ msgid ""
 msgstr ""
 " -q             Parancssori módban a folyamatos állapotjelzés tiltása\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, fuzzy, c-format
 #| msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o kulcs=érték     A 'kulcs' nevű beállítási opció 'érték'-re állítása\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, fuzzy, c-format
 #| msgid ""
 #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5799,36 +5791,36 @@ msgstr ""
 " --with(out)-recommends\tAz ajánlások erős függőségként való kezelésének\n"
 "                be/kikapcsolása\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fnév: Az aptitude kiterjesztett állapotinformációjának beolvasása az "
 "fnévből\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Az új csomagok listájának letöltése induláskor\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             Ez a súgó\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             A telepítések végrehajtása induláskor.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Az aptitude-nak nincs Szuper Tehén Ereje\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 #| msgid "replaces"
 msgid "trace"
@@ -5836,13 +5828,13 @@ msgstr "helyettesíti ezt:"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 #| msgid "no"
 msgid "info"
@@ -5850,13 +5842,13 @@ msgstr "nem"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 #| msgid "Err "
 msgid "error"
@@ -5864,102 +5856,82 @@ msgstr "Hib "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "Bezár"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
 #| msgid "Invalid operation %s"
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Érvénytelen művelet: %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "-q= után egy számot kell megadni\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "-q= után számot kell megadni, nem ezt: %s\n"
-
-#: src/main.cc:798
-#, fuzzy, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "A -o kulcs=érték formájú argumentumot vár %s helyett"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "FURCSAS�G: ismeretlen műveletkód\n"
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 #| msgid "Package"
 msgid "first-package"
 msgstr "Csomag"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 #| msgid "All Packages"
 msgid "all-packages"
 msgstr "Minden csomag"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5967,40 +5939,34 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 #| msgid "Only one of -u and -i may be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "A -u és a -i közül egyszerre csak az egyiket lehet megadni\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 #| msgid ""
 #| "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr "A -u és a -i nem adható meg parancssori módban (pl. 'install' mellett)"
 
-#: src/main.cc:1105
-#, fuzzy
-#| msgid "-u and -i may not be specified with a command"
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "A -u és a -i nem adható meg parancs mellett"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Ismeretlen parancs: \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Ismeretlen parancs: \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Lekezeletlen kivétel: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, fuzzy, c-format
 msgid ""
 "Backtrace:\n"
@@ -6018,7 +5984,7 @@ msgstr "Keresés: "
 msgid "Search backwards for: "
 msgstr "Keresés visszafelé: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Aknakereső"
 
@@ -6228,7 +6194,7 @@ msgstr "A mine-help.txt kódolása|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 18 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Csomag"
 
@@ -6309,8 +6275,8 @@ msgstr "<nincs megadva>"
 msgid "<none>"
 msgstr "<nincs>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtuális"
@@ -6444,7 +6410,7 @@ msgstr "Nem tudom átkódolni a csomag megjelenítési formátumot ez után: \"%
 msgid "Internal error: Default column string is unparsable"
 msgstr "Belső hiba: az alap oszlopszöveg nem elemezhető"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Metacsomagok"
 
@@ -6599,21 +6565,17 @@ msgstr "Az indexérték 1 vagy nagyobb szám lehet, nem \"%s\""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "Az indexérték %ls túl nagy. Az elérhető csoportok (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "TAGNÉLKÜLI CSOMAGOK"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "HI�NYZÓ TAG"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Forráscsomag: "
@@ -7249,7 +7211,7 @@ msgstr "Gyorstár betöltése"
 msgid "Really quit Aptitude?"
 msgstr "Valóban kilépsz az Aptitude-ból?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -7334,7 +7296,7 @@ msgstr ""
 msgid "License"
 msgstr "^Licenc"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 #, fuzzy
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Megmutatja a licencfeltételeket, mely alapján a program másolható"
@@ -7356,7 +7318,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Súgó"
 
@@ -7386,7 +7348,7 @@ msgstr "Kézikönyv"
 msgid "FAQ"
 msgstr "^GYIK"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Gyakran ismételt kérdések (FAQ) listája"
 
@@ -7429,15 +7391,15 @@ msgstr ""
 "%n%nSzeretnéd a könyvtárat és tartalmát törölni? Ha \"Nem\"-mel válaszolsz, "
 "ez az üzenet nem jelenik meg még egyszer."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "A csomagletöltés állapotának megtekintése"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Csomagletöltés"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7449,35 +7411,35 @@ msgstr ""
 "rendszerbiztonságot%b.  Csak akkor folytasd a telepítést, ha tényleg biztos, "
 "hogy ezt akarod.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [%s verzió]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Tényleg folytatom"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Telepítés megszakítása"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Csomagtelepítés előnézete"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "A végrehajtandó műveletek megtekintése és/vagy módosítása"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Néhány csomag törött volt és javítva lett:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Ezekre a függőségi problémákra nincs megoldás!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7486,7 +7448,7 @@ msgstr ""
 "Elfogyott a függőségek feloldására adott idő (\"%s\" billentyűre tovább "
 "próbálkozom)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7494,19 +7456,19 @@ msgstr ""
 "A csomagok telepítéséhez/törléséhez rendszergazdai jogosultságok kellenek, "
 "amikkel jelenleg nem rendelkezel.  Szeretnél rendszergazdaként bejelentkezni?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Bejelentkezek rendszergazdaként"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Nem jelentkezek be rendszergazdaként"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Nincs telepítésre, eltávolításra vagy frissítésre jelölt csomag."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7516,19 +7478,19 @@ msgstr ""
 "csomagok frissíthetők, de nem jelölted ki őket frissítésre. Üsd le az \"U\"-"
 "t a frissítésre való kijelöléshez."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Csomaglista frissítése"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Csomaglista frissítés folyamatának mutatása"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Lista frissítés"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7536,23 +7498,23 @@ msgstr ""
 "A csomaglista frissítés root jogot igényel, mellyel most nem rendelkezel. "
 "Akarsz erre szert tenni?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Időpocsékolás aknakeresésre"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Tisztítás letöltés alatt nem lehetséges"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Letöltött fájlok törlése"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "A letöltött fájlok törölve"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7564,11 +7526,11 @@ msgstr ""
 "A csomaglista frissítés root jogot igényel, mellyel most nem rendelkezel. "
 "Akarsz erre szert tenni?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "Az apt cache fájl nem található; az auto-clean nem lehetséges"
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7577,7 +7539,7 @@ msgstr ""
 "Az elavult letöltött csomagfájlok törlésének eredménye %sB fájl "
 "felszabadulása."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 #| msgid ""
 #| "Updating the package lists requires administrative privileges, which you "
@@ -7589,125 +7551,125 @@ msgstr ""
 "A csomaglista frissítés root jogot igényel, mellyel most nem rendelkezel. "
 "Akarsz erre szert tenni?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Nincs több megoldás"
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Nem találok alkalmazható megoldást"
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "A megoldás keresésére megadott idő elfogyott"
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Függőségek feloldása"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Megoldások keresése a teljesítetlen függőségekhez"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Nem sikerült megnyitni: %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Hiba az ütközésfeloldó állapotának mentése közben"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "Csomagok ^telepítése/eltávolítása"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "Csomaglista f^rissítése"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Fri^ssíthetőnek jelöl"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "Új csomagok el^felejtése"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Függő műveletek törlés^e"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Csomaggyorstár tisztítása"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Elav^ult fájlok tisztítása"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "Csomaggyorstár új^ratöltése"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "Aknakereső ^játék"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^Légy root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Kilépés"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Visszavon"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Telepítés"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "A jelenleg kiválasztott csomag telepítendőként vagy frissítendőként való "
 "megjelölése"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Eltávolítás"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "A jelenleg kiválasztott csomag eltávolítandóként való megjelölése"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "Tör^lés"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "A jelenleg kiválasztott csomag megjelölése a beállítófájljaival együtt való "
 "eltávolításra"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "T^art"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Minden művelet visszavonása erre a csomagra"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Fog"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7715,11 +7677,11 @@ msgstr ""
 "Minden művelet visszavonása erre a csomagra, és visszatartása a későbbi "
 "frissítésektől is"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "A^uto kijelölés"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7727,11 +7689,11 @@ msgstr ""
 "A kiválasztott csomag automatikusan telepítettként való megjelölése; "
 "automatikusan el lesz távolítva, ha nincs tőle függő csomag"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Ké^zi kijelölés"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7739,11 +7701,11 @@ msgstr ""
 "A kiválasztott csomag manuálisan telepítettként való megjelölése; nem lesz "
 "eltávolítva, csak ha manuálisan eltávolítod lesz"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "Verzió t^iltása"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7751,78 +7713,78 @@ msgstr ""
 "A kiválasztott csomag verziójelöltje telepí\ttésének tiltása; az újabb "
 "verziók a szokásos módon lesznek telepítve"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformáció"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Több információ megjelenítése a kiválasztott csomagokról"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Munkanapló"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "A kiválasztott csomag Debian változásnaplójának megjelenítése"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "Megoldás vizs^gálata"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Megvizsgálja a most kijelölt megoldást a függőségi problémához."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Megoldás ^alkalmazása"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "A jelen megoldás műveleteinek végrehajtása"
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "Kö^vetkező megoldás"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Következő megoldás kijelölése a függőségi problémához"
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "Elő^ző megoldás"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Előző megoldás kijelölése a függőségi problémához"
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^Első megoldás"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Első megoldás kiválasztása a függőségi problémákhoz."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "^Utolsó megoldás"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7830,172 +7792,172 @@ msgstr ""
 "Utolsó megoldás kiválasztása a függőségi problémákhoz, mely igen nehezen "
 "állt elő."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "El^dobás"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Eldobja a most kijelölt műveletet"
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "El^fogadás"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Elfogadja a most kijelölt műveletet."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Cél megtekintése"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Megtekinti a választott művelet által érintett csomagot"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Keresés"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Előre keres"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "Keresés ^hátra"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Hátra keres"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Keresés ^ismét"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Utolsó keresés ismétlése"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 #, fuzzy
 msgid "Find Again ^Backwards"
 msgstr "Keresés ^hátra"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 #, fuzzy
 msgid "Repeat the last search in the opposite direction"
 msgstr "Utolsó keresés ismétlése"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "Szű^rt lista"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Szűrőt alkalmaz a csomaglistára"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "Szűret^len lista"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Leszedi a csomaglista szűrőjét"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "^Törött keresése"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Kikeresi a következő teljesítetlen függőségű csomagot"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 #, fuzzy
 msgid "^Preferences"
 msgstr "ElőFüggőségek"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^UI opciók"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Felhasználói felület beállításainak módosítása"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Függőség kezelés"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Függőség kezelés beállításainak módosítása"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Egyebek"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "A program egyéb beállításainak módosítása"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "E^redeti opciók"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Visszatérés a rendszer alapbeállításaihoz"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Következő"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "A következő nézet megtekintése"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Előző"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "A előző nézet megtekintése"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Bezár"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Nézet bezárása"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Ú^j csomagnézet"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Új alapértelmezett csomagnézet létrehozása"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "^Ajánlások vizsgálata"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -8003,88 +7965,88 @@ msgstr ""
 "Azon csomagok megtekintése, amik telepítése ajánlott, de jelenleg nincsenek "
 "telepítve."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Új la^pos csomaglista"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "A csomagok egyetlen csoportosítás nélküli listaként való megjelenítése"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Új ^Debtag böngésző"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "A csomagok böngészése a Debtags adatok segítségével"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Új kategória ^böngésző"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Csomagok böngészése kategória szerint"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Névjegy"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Infók e programról"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Súgó"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "On-line súgó"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "Felhasználói ^Kézikönyv"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Részletes program kézikönyv megtekintése"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^GYIK"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Hírek"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Fontos változások a program egyes verziói közt - "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licenc"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Műveletek"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Keresés"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Opciók"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Nézetek"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8093,11 +8055,11 @@ msgstr ""
 "%ls: Menü  %ls: Súgó  %ls: Kilép  %ls: Frissít  %ls: Csomagokat Letölt/"
 "Telepít/Töröl"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -8128,9 +8090,43 @@ msgstr "URL a módosításnaplók letöltéséhez"
 msgid "Downloading the changelog of %s"
 msgstr "Munkanapló letöltése"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Csak a hivatalos Debian csomagok munkanaplói olvashatók."
+#~ msgid "MISSING TAG"
+#~ msgstr "HI�NYZÓ TAG"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL a módosításnaplók letöltéséhez"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "A(z) %s nem hivatalos Debian csomag, így nem jeleníthető meg a "
+#~ "változásnaplója."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Nem találtam \"%s\" nevű csomagot"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Nem tudom elemezni a(z) %s mintát"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "-q= után egy számot kell megadni\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "-q= után számot kell megadni, nem ezt: %s\n"
+
+#, fuzzy
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "A -o kulcs=érték formájú argumentumot vár %s helyett"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "FURCSAS�G: ismeretlen műveletkód\n"
+
+#, fuzzy
+#~| msgid "-u and -i may not be specified with a command"
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "A -u és a -i nem adható meg parancs mellett"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Csak a hivatalos Debian csomagok munkanaplói olvashatók."
 
 #~ msgid "Err "
 #~ msgstr "Hib "
@@ -8267,11 +8263,6 @@ msgstr "Csak a hivatalos Debian csomagok munkanaplói olvashatók."
 #~ msgstr "Munkanapló letöltése"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Nem találok megoldást."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Nem sikerült megnyitni a(z) %s csomaghierarchiafájlt"
diff --git a/po/it.gmo b/po/it.gmo
index c1253a38..a62d15b5 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 7d8ebe7b..ed4d1cc6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude 0.4.11.10\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:26+0800\n"
 "Last-Translator: Danilo Piazzalunga <danilopiazza@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -404,24 +404,10 @@ msgstr ""
 "scaricati dagli archivi presenti in sources.list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL da usare per scaricare i changelog"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Questa opzione controlla il modello usato per scaricare i changelog dal sito "
-"web di Debian. Si dovrebbe aver bisogno di modificare questa impostazione "
-"solo se i changelog vengono spostati su un URL diverso."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Mostrare un'anteprima prima di compiere l'azione vera e propria"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -430,12 +416,12 @@ msgstr ""
 "un'installazione, il programma prima mostrerà prima un riassunto delle "
 "azioni che sta per compiere."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Dimenticare quali pacchetti sono «nuovi» quando si aggiorna l'elenco"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -444,12 +430,12 @@ msgstr ""
 "nuovi dopo che si aggiornano gli elenchi dei pacchetti (ad esempio premendo "
 "«u»)."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Dimenticare quali pacchetti sono «nuovi» quando si installa/rimuove"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -459,12 +445,12 @@ msgstr ""
 "nuovi dopo che si esegue un'installazione o dopo che si installano o "
 "rimuovono pacchetti dalla riga di comando."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "Non avvertire alla prima modifica fatta in modalità di sola lettura."
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -474,12 +460,12 @@ msgstr ""
 "quando si modifica lo stato di un pacchetto senza avere il permesso di "
 "applicare le modifiche al sistema."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Avvertire se si cerca di eseguire un'azione privilegiata senza essere root"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -491,11 +477,11 @@ msgstr ""
 "senza essere root). Viene data l'opportunità di accedere come root ed "
 "eseguire tale azione con i privilegi di root."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "File da usare come log per le azioni"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -507,11 +493,11 @@ msgstr ""
 "file è la barra verticale («%B|%b»), il resto del nome viene interpretato "
 "come un comando di shell che riceve il log sullo standard input."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Risolvere le dipendenze quando un pacchetto viene selezionato"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -524,11 +510,11 @@ msgstr ""
 "dipendenze incorporato, ma può produrre risultati non ottimali o fallire "
 "completamente in alcuni casi."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "Correggere i pacchetti difettosi prima di installare o rimuovere"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -540,11 +526,11 @@ msgstr ""
 "risolutore di problemi. In caso contrario, aptitude chiede all'utente una "
 "soluzione per le dipendenze non soddisfatte."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Installare automaticamente i pacchetti raccomandati"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -562,11 +548,11 @@ msgstr ""
 "inutilizzati» sono abilitate, i pacchetti raccomandati da un pacchetto "
 "installato non vengono rimossi automaticamente."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Rimuovere automaticamente i pacchetti inutilizzati"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -584,11 +570,11 @@ msgstr ""
 "raccomandati» sono abilitate, i pacchetti installati automaticamente non "
 "vengono rimossi se un pacchetto installato li raccomanda."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Pacchetti da non rimuovere automaticamente"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -598,12 +584,12 @@ msgstr ""
 "trattati come se un pacchetto installato dipendesse da essi: non vengono mai "
 "rimossi automaticamente come pacchetti inutilizzati."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Permette al risolutore delle dipendenze di modificare bloccati o proibiti"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -625,15 +611,15 @@ msgstr ""
 "comunque i pacchetti bloccati quando installa automaticamente le dipendenze "
 "di un pacchetto appena selezionato per l'installazione o l'aggiornamento."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Opzioni dell'interfaccia utente"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Gestione delle dipendenze"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Varie"
 
@@ -738,7 +724,7 @@ msgstr "Impossibile trovare il pacchetto sorgente di «%s».\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Impossibile soddisfare le dipendenze «Build-Depends»: %s\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -747,7 +733,7 @@ msgstr ""
 "Nota: «%s», che fornisce il pacchetto virtuale\n"
 "      «%s», è già installato.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -756,7 +742,7 @@ msgstr ""
 "Nota: «%s», che fornisce il pacchetto virtuale\n"
 "      «%s», sta già per essere installato.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -765,17 +751,22 @@ msgstr ""
 "«%s» esiste nel database dei pacchetti ma non è un pacchetto\n"
 "reale e non è fornito da nessun pacchetto.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "«%s» è un pacchetto virtuale fornito da:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Bisogna sceglierne uno da installare.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Il pacchetto \"%s\" non ha candidati da installare"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -784,64 +775,57 @@ msgstr ""
 "Nota: si sta selezionando «%s» al posto del\n"
 "      pacchetto virtuale «%s»\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s è già installato e si trova alla versione richiesta (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s non è attualmente installato e non verrà quindi reinstallato.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s è già installato e si trova alla versione richiesta (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s non è attualmente installato e non verrà quindi reinstallato.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Il pacchetto %s non è installato e non verrà quindi rimosso\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "Il pacchetto %s non è installato: impossibile proibirne l'aggiornamento\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Il pacchetto %s non è aggiornabile: impossibile proibirne l'aggiornamento\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Nota: si sta selezionando il task «%s: %s» per l'installazione\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "È possibile specificare una versione solo con i comandi «install» o «forbid-"
-"version».\n"
+"version»"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "È possibile specificare un archivio solo con il comando «install».\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "È possibile specificare un archivio solo con il comando «install»"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -850,7 +834,7 @@ msgstr ""
 "Impossibile trovare il pacchetto «%s» e più di 40\n"
 "pacchetti hanno un nome che contiene «%s».\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -859,14 +843,14 @@ msgstr ""
 "Impossibile trovare il pacchetto «%s». Ad ogni modo, i seguenti\n"
 "pacchetti hanno un nome che contiene «%s»:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Impossibile trovare un pacchetto il cui nome o descrizione corrispondano a "
 "«%s»\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -884,7 +868,7 @@ msgstr ""
 "Impossibile trovare un pacchetto che corrisponda a «%s». Ad ogni modo,\n"
 "i seguenti pacchetti hanno una descrizione che contiene «%s»:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Il carattere «%c» non descrive un'azione ammessa\n"
@@ -907,103 +891,87 @@ msgstr "Err "
 msgid "Changelog download failed: %s"
 msgstr "ChangeLog di %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "Impossibile eseguire sensible-pager. Questo è un sistema Debian funzionante?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s non è un pacchetto Debian ufficiale: impossibile mostrarne il changelog."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Impossibile trovare il changelog di «%s»"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "Impossibile trovare il changelog di «%s»"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: Il comando clean non accetta argomenti\n"
+msgid "The clean command takes no arguments"
+msgstr "Il comando clean non accetta argomenti"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Canc %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr ""
 "Impossibile determinare la directory home, salvato su /tmp/function_pkgs"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Canc %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: Il comando autoclean non accetta argomenti\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Il comando autoclean non accetta argomenti"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Verrebbero liberati %sB di spazio su disco\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Liberati %sB di spazio su disco\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operazione «%s» non ammessa"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Modello non previsto passato come argomento a «keep-all»"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "Impossibile risolvere le dipendenze in modo sicuro. Eseguire con --full-"
-"resolver.\n"
+"resolver."
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Uscita.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "download: si deve specificare almeno un pacchetto da scaricare\n"
+msgid "download: you must specify at least one package to download"
+msgstr "download: si deve specificare almeno un pacchetto da scaricare"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Impossibile leggere l'elenco delle sorgenti"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Impossibile trovare il pacchetto di nome «%s»"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1046,33 +1014,24 @@ msgid "[Working]"
 msgstr "[In corso]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: è richiesto almeno un argomento (la directory in\n"
-"cui scrivere i file).\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Il pacchetto «%s» è inesistente"
+"extract-cache-entries: è richiesto almeno un argomento (la directory in cui "
+"scrivere i file)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 "Nessun pacchetto selezionato dal criterio di ricerca; niente da eseguire.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: Il comando forget-new non accetta argomenti\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Il comando forget-new non accetta argomenti"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Sarebbero dimenticati quali pacchetti sono «nuovi»\n"
@@ -1181,18 +1140,18 @@ msgstr "I seguenti pacchetti saranno aggiornati:"
 msgid "The following partially installed packages will be configured:"
 msgstr "I seguenti pacchetti parzialmente installati saranno configurati:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "I seguenti pacchetti ESSENZIALI saranno RIMOSSI.\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "I seguenti pacchetti ESSENZIALI saranno DIFETTOSI dopo questa azione:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1203,16 +1162,16 @@ msgstr ""
 "            NON proseguire a meno che non si sappia ESATTAMENTE ciò che si\n"
 "            sta per fare.\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "So che si tratta di una pessima idea"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Per continuare, inserire la frase «%s»:\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1229,7 +1188,7 @@ msgstr ""
 "si sta facendo.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1238,7 +1197,7 @@ msgstr ""
 "*** ATTENZIONE ***  Installazione di pacchetti non sicuri permessa perché\n"
 "                    %s::CmdLine::Ignore-Trust-Violations vale «true»\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1251,7 +1210,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1260,98 +1219,98 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Ignorare questo avvertimento e procedere comunque?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Per continuare, inserire «%s»; per annullare, inserire «%s»: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Input non riconosciuto. Inserire «%s» oppure «%s».\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "I seguenti pacchetti sono RACCOMANDATI ma NON verranno installati:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "I seguenti pacchetti sono CONSIGLIATI ma NON verranno installati:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Nessun pacchetto verrà installato, aggiornato o rimosso.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pacchetti aggiornati, %lu installati, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstallati, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu retrocessi (downgraded), "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu da rimuovere e %lu non aggiornati.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "È necessario prelevare %sB/%sB di archivi. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "È necessario prelevare %sB di archivi. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Dopo l'estrazione, verranno occupati %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Dopo l'estrazione, verranno liberati %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Nessun pacchetto da mostrare; specificare i nomi dei pacchetti dopo «i».\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Premere Invio per continuare."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Nessun pacchetto da mostrare; specificare i nomi dei pacchetti dopo «c».\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1360,79 +1319,79 @@ msgstr ""
 "Nessun pacchetto da mostrare; specificare zero o più radici della ricerca "
 "seguiti dai pacchetti da giustificare.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "continua l'installazione"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "abbandona ed esce"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr "mostra informazioni su uno o più pacchetti, elencati dopo «i»"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
 msgstr "mostra i changelog Debian di uno o più pacchetti, elencati dopo «c»"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "mostra/nasconde le informazioni sulle dipendenze"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "mostra/nasconde le variazioni dello spazio occupato"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "mostra/nasconde i numeri di versione"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1441,27 +1400,27 @@ msgstr ""
 "spiega perché installare un pacchettoporta all'installazione di un altro "
 "pacchetto."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "esegue il risolutore di dipendenze automatico per correggere le dipendenze "
 "non soddisfatte."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "entra nell'interfaccia visuale"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1473,47 +1432,47 @@ msgstr ""
 "pacchetti o modelli. L'azione sarà applicata a tutti i pacchetti elencati. "
 "Sono disponibili le seguenti azioni:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "\"'+\"' per installare i pacchetti"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "\"'+M\"' per installare i pacchetti e segnarli come installati "
 "automaticamente"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "\"-\" per rimuovere i pacchetti"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "\"_\" per eliminare i pacchetti"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "\"=\" per bloccare i pacchetti"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "\":\" per mantenere i pacchetti nel loro stato attuale senza bloccarli"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "\"&M\" per segnare i pacchetti come installati automaticamente"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "\"&m\" per segnare i pacchetti come installati manualmente"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "\"&BD\" per installare le dipendenze «Build-Depends» di un pacchetto."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1521,29 +1480,29 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "\"&M\" per segnare i pacchetti come installati automaticamente"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Comandi:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1551,19 +1510,19 @@ msgstr ""
 "impossibile trovare una soluzione per queste dipendenze. È possibile "
 "risolverle manualmente o inserire «n» per uscire."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Continuare? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Risolvere manualmente queste dipendenze? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Risposta non ammessa. Immettere un comando valido o «?» per l'aiuto.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1572,7 +1531,7 @@ msgstr ""
 "installare un pacchetto), «R» per provare la risoluzione automatica delle "
 "dipendenze o «N» per annullare."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1583,7 +1542,7 @@ msgstr ""
 "Le informazioni sulle dipendenze vengono mostrate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1594,7 +1553,7 @@ msgstr ""
 "Le informazioni sulle dipendenze non vengono mostrate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1605,7 +1564,7 @@ msgstr ""
 "Le versioni vengono mostrate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1616,7 +1575,7 @@ msgstr ""
 "Le versioni non vengono mostrate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1627,7 +1586,7 @@ msgstr ""
 "Le variazioni dello spazio occupato vengono mostrate.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1764,6 +1723,11 @@ msgstr "Indicare almeno una coppia «pacchetto/versione» dopo «%c»"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "È richiesta una versione o «%s» dopo «%s»"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Il pacchetto «%s» è inesistente"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1913,7 +1877,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 "Le dipendenze verrebbero risolte, ma il risolutore non è statao creato."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1943,7 +1907,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Sono disponibili i seguenti comandi:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "File su cui salvare lo stato del risolutore:"
 
@@ -1976,7 +1940,7 @@ msgstr ""
 "*** ERRORE: ricerca annullata da un'eccezione grave. Si può continuare\n"
 "            la ricerca, ma alcune soluzioni non saranno raggiungibili."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1985,27 +1949,26 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Impossibile risolvere le dipendenze per l'aggiornamento (nessuna soluzione "
 "trovata)."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Impossibile risolvere le dipendenze per l'aggiornamento (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "impossibile effettuare iconv di %s\n"
+msgid "iconv of %s failed"
+msgstr "impossibile effettuare iconv di %s"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "search: si deve specificare almeno un'espressione di ricerca\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "search: si deve specificare almeno un'espressione di ricerca"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2048,7 +2011,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "I seguenti pacchetti hanno dipendenze non soddisfatte:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2271,7 +2234,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Fornisce"
 
@@ -2285,15 +2248,9 @@ msgstr "Descrizione: "
 msgid "Homepage: "
 msgstr "Homepage: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Impossibile trovare il pacchetto %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Impossibile analizzare il modello %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Nessun pacchetto trovato"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2304,14 +2261,13 @@ msgstr "Sarebbero stati scaricati/installati/rimossi pacchetti.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Errore interno: l'ordinamento non è terminato"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Cancellazione dei vecchi file scaricati"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: Il comando update non accetta argomenti\n"
+msgid "The update command takes no arguments"
+msgstr "Il comando update non accetta argomenti"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2330,136 +2286,158 @@ msgstr ""
 "%s: troppo pochi argomenti; richiesto almeno il nome di un'etichetta e un "
 "pacchetto.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Impossibile trovare una versione candidata di %s\n"
+msgid "No candidate version found for %s"
+msgstr "Impossibile trovare una versione candidata di %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
+msgid "No current or candidate version found for %s"
 msgstr ""
-"Impossibile trovare una versione corrente o una versione candidata per %s\n"
+"Impossibile trovare una versione corrente o una versione candidata per %s"
 
 # NdT: Messaggio mostrato se viene specificato un archivio (stable, testing, ...)
 # che non esiste in sources.list o in cui il pacchetto non è presente.
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Impossibile trovare l'archivio «%s» per il pacchetto «%s»\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Impossibile trovare l'archivio «%s» per il pacchetto «%s»"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Impossibile trovare la versione «%s» del pacchetto «%s»\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Impossibile trovare la versione «%s» del pacchetto «%s»"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Errore interno: valore non ammesso %i fornito a cmdline_find_ver.\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Errore interno: valore non ammesso %i fornito a cmdline_find_ver"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
 msgstr ""
-"Non è possibile specificare sia l'archivio che la versione di un pacchetto\n"
+"Non è possibile specificare sia l'archivio che la versione di un pacchetto"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Impossibile trovare il changelog di «%s»"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d difettoso [%+d]"
 msgstr[1] "%d difettosi [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d aggiornato [%+d]"
 msgstr[1] "%d aggiornati [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d nuovo [%+d]"
 msgstr[1] "%d nuovi [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Stato attuale: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "%d pacchetto è diventato obsoleto."
 msgstr[1] "%d pacchetti sono diventati obsoleti."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "%d pacchetto è diventato obsoleto: "
 msgstr[1] "%d pacchetti sono diventati obsoleti: "
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Manca la virgola dopo il nome dell'etichetta «%s»"
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Impossibile trovare il pacchetto %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Impossibile trovare il changelog di «%s»"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Nota: si sta selezionando il task «%s: %s» per l'installazione\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Impossibile trovare il changelog di «%s»"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Pacchetto: "
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Pacchetto sorgente: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "Archivio"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "search: si deve specificare almeno un'espressione di ricerca\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2482,7 +2460,7 @@ msgstr "Attuale"
 msgid "Candidate"
 msgstr "Candidato"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Installare"
 
@@ -2585,23 +2563,20 @@ msgstr "Impossibile trovare un motivo per installare %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Pacchetti che dipendono da %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Il pacchetto di nome «%s» non esiste."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Impossibile analizzare il modello di ricerca."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
-"%s: questo comando richiede almeno un argomento (il pacchetto da "
-"esaminare).\n"
+"%s: questo comando richiede almeno un argomento (il pacchetto da esaminare)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2628,12 +2603,12 @@ msgid "UNAVAILABLE"
 msgstr "NON DISPONIBILE"
 
 # NdT: Tag/etichette di Debtags
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Etichette"
 
 # NdT: Tag/etichette di Debtags
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Etichette utente"
 
@@ -2841,32 +2816,32 @@ msgstr ""
 "dpkg o un altro strumento di apt sta già installando pacchetti. Apertura in "
 "sola lettura. Ogni modifica allo stato dei pacchetti NON sarà salvata."
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 msgid "allowed"
 msgstr "allow_choices"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "main"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2933,38 +2908,46 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "La cache dei pacchetti non è disponibile; impossibile scaricare e installare "
 "pacchetti."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 "Errore interno: impossibile generare l'elenco dei pacchetti da scaricare"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "impossibile scaricare %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Impossibile scaricare alcuni pacchetti. Potrebbe essere utile eseguire "
+"\"aptitude update\" o provare l'opzione \"--fix-missing\"."
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Impossibile correggere a causa di pacchetti non disponibili"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr ""
 "Errore durante l'installazione di un pacchetto. Tentativo di ripristino:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3115,13 +3098,13 @@ msgstr ""
 "\n"
 "Registrazione completata.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "Scaricamento dei pacchetti"
@@ -3235,18 +3218,18 @@ msgstr ""
 "I file dell'indice dei pacchetti sono danneggiati: manca il campo "
 "«Filename:» per il pacchetto %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Changelog di %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "URL da usare per scaricare i changelog"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL da usare per scaricare i changelog"
@@ -3298,26 +3281,27 @@ msgid "Failed to parse the cost settings string: %s"
 msgstr "Impossibile analizzare il modello %s"
 
 # NdT: Tag/etichette di Debtags
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Costruzione del database delle etichette"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "Nessun pacchetto difettoso."
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "Nessun pacchetto difettoso."
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3465,41 +3449,41 @@ msgstr ""
 msgid "_File"
 msgstr "Falso"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Procede ad installare e rimuovere i pacchetti"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Cerca nuove versioni dei pacchetti"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Richiede l'aggiornamento di tutti i pacchetti aggiornabili non bloccati"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Dimentica quali pacchetti sono «nuovi»"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Annulla tutte le installazioni, rimozioni, blocchi e aggiornamenti in attesa."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Cancella i file dei pacchetti scaricati precedentemente"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Cancella i file dei pacchetti che non si possono più scaricare"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Ricarica la cache dei pacchetti"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3509,7 +3493,7 @@ msgstr ""
 "Esegue «su» per diventare root; questo farà ripartire il programma, "
 "mantenendo però le impostazioni attuali"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Esce dal programma"
 
@@ -3517,7 +3501,7 @@ msgstr "Esce dal programma"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 "Annulla l'ultima operazione o gruppo di operazioni effettuate sui pacchetti"
@@ -3552,7 +3536,7 @@ msgid "_Help"
 msgstr "Aiuto"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3561,19 +3545,19 @@ msgstr ""
 msgid "Update"
 msgstr "Aggiornamento elenco"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Pacchetti"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Anteprima"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Risolutore"
 
@@ -3761,7 +3745,7 @@ msgid "Fix Manually"
 msgstr "Manuale"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Aggiornare"
 
@@ -4292,11 +4276,11 @@ msgstr "Installato"
 msgid "Reinstall"
 msgstr "Reinstallare"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Retrocedere (downgrade)"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Rimuovere"
 
@@ -4332,7 +4316,7 @@ msgstr "Applica un filtro all'elenco dei pacchetti"
 msgid "Download already running."
 msgstr "Scaricamento..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Un aggiornamento dell'elenco dei pacchetti o un'installazione è già in corso."
@@ -4393,38 +4377,38 @@ msgstr "Il pacchetto «%s» è inesistente"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Impossibile sostituire %s con il nuovo file di configurazione"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Scaricamento dei pacchetti"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "Nessun pacchetto difettoso."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "Nessun pacchetto difettoso."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "Risoluzione delle dipendenze"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Nessun pacchetto difettoso."
 msgstr[1] "Nessun pacchetto difettoso."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s: modifiche"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s: modifiche"
@@ -4432,7 +4416,7 @@ msgstr "%s: modifiche"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4442,63 +4426,63 @@ msgstr[1] "%d da installare"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "impossibile rimuovere %s"
 msgstr[1] "impossibile rimuovere %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "DimScaricamento"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr ""
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "Installato"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "^Elimina"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Mantenere"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Bloccare"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "Manuale utente"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4538,7 +4522,7 @@ msgstr "no"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4583,17 +4567,17 @@ msgstr "%s; verrà installato automaticamente"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "Cerca"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "Costruzione della vista"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Costruzione della vista"
@@ -5301,108 +5285,109 @@ msgstr "Tipo di allineamento sconosciuto: «%s»"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "I criteri di ordinamento per nome non accettano argomenti"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Nome del criterio di ordinamento non ammesso (lunghezza nulla)"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "\"(\" solitaria nella descrizione del criterio di ordinamento"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Tipo di criterio di ordinamento «%s» non ammesso"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Impossibile decodificare la stringa multibyte dopo «%ls»"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Impossibile decodificare la stringa di caratteri larghi dopo «%s»"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilato il %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilatore: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Compilato con:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  Versione di Apt: %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  Versione di NCurses: sconosciuta\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  Versione di NCurses: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  Versione di libsigc++: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Supporto a Ept abilitato.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Supporto a Ept disabilitato.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  Versione di Apt: %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  Versione di Apt: %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Supporto a Ept disabilitato.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s compilato il %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Supporto a Ept disabilitato.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5410,32 +5395,32 @@ msgstr ""
 "\n"
 "Versioni attuali delle librerie:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  Versione di NCurses: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  Versione di cwidget: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Versione di Apt: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Uso: aptitude [-S nomefile] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opzioni] <azione> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5444,42 +5429,42 @@ msgstr ""
 "  Azioni (se omesse, Aptitude entrerà nella modalità interattiva):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Installa/aggiorna pacchetti.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Rimuove pacchetti.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Elimina i pacchetti e i loro file di configurazione.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Imposta i pacchetti come bloccati.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Rimuove il blocco ad un pacchetto bloccato.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Segna i pacchetti come installati automaticamente.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Segna i pacchetti come installati manualmente.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5488,17 +5473,17 @@ msgstr ""
 " forbid-version - Impedisce di aggiornare un pacchetto ad una certa "
 "versione.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Scarica l'elenco dei pacchetti nuovi/da aggiornare.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Esegue un aggiornamento sicuro.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5507,52 +5492,52 @@ msgstr ""
 " full-upgrade - Esegue un aggiornamento, eventualmente installando e\n"
 "                rimuovendo pacchetti.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "\"&BD\" per installare le dipendenze «Build-Depends» di un pacchetto."
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Dimentica quali pacchetti sono «nuovi».\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Cerca un pacchetto per nome o espressione.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Mostra informazioni dettagliate su un pacchetto.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Mostra informazioni dettagliate su un pacchetto\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Cancella i file dei pacchetti scaricati.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Cancella i file dei vecchi pacchetti scaricati.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Mostra il changelog di un pacchetto.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Scarica il file .deb di un pacchetto.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5561,7 +5546,7 @@ msgstr ""
 " reinstall    - Scarica ed eventualmente reinstalla un pacchetto già "
 "installato.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5573,7 +5558,7 @@ msgstr ""
 "richiedono\n"
 "                il pacchetto specificato.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5587,44 +5572,44 @@ msgstr ""
 "                uno o più pacchetti vanno in conflitto con il pacchetto "
 "dato.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opzioni:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Questo help.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Questo help\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simula le azioni, senza eseguirle realmente\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -5632,19 +5617,19 @@ msgstr ""
 " -d             Scarica i pacchetti e basta, senza installare o rimuovere "
 "nulla\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Chiede sempre conferma prima di un'azione.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
 " -y             Suppone che la risposta a semplici domande sì/no sia «sì».\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5654,7 +5639,7 @@ msgstr ""
 "ricerca;\n"
 "                vedere anche il manuale.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5663,7 +5648,7 @@ msgstr ""
 " -O ordine      Specifica come ordinare i risultati di una ricerca; vedere\n"
 "                anche il manuale.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
@@ -5671,33 +5656,33 @@ msgstr ""
 " -w larghezza   Specifica la larghezza per mostrare i risultati di una "
 "ricerca.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Prova in tutti i modi a correggere i pacchetti difettosi\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Mostra quali versioni dei pacchetti si sta per installare\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             Mostra le dipendenze dei pacchetti cambiati automaticamente\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 " -Z             Mostra i cambiamenti nella dimensione occupata da ogni "
 "pacchetto\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5705,13 +5690,13 @@ msgid ""
 msgstr ""
 " -v             Mostra informazioni extra (può essere fornita più volte).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [release]   Imposta la release da cui installare i pacchetti.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5720,13 +5705,13 @@ msgstr ""
 " -q             In modalità riga di comando, non mostra gli indicatori di\n"
 "                avanzamento incrementali.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o chiave=val  Imposta l'opzione di configurazione di nome «chiave».\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5735,41 +5720,41 @@ msgstr ""
 " --with(out)-recommends\n"
 "              Specifica se trattare Raccomanda come una dipendenza forte.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S nomefile: Legge lo stato esteso di Aptitude da nomefile\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u         : Scarica il nuovo elenco dei pacchetti all'avvio\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr ""
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i         : Esegue un'installazione all'avvio\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Questo Aptitude non ha i Poteri della Super Mucca.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 msgid "trace"
 msgstr "vero"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 msgid "debug"
 msgstr ""
 
@@ -5778,118 +5763,98 @@ msgstr ""
 # ho preferito mettere prima il nome del pacchetto.
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:399
+#: src/main.cc:365
 #, fuzzy
 msgid "info"
 msgstr "%s: informazioni"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 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:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "falso"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
-#, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
-msgstr "Operazione «%s» non ammessa"
-
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "-q= richiede un argomento numerico\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "-q= richiede un argomento numerico, non «%s»\n"
-
-#: src/main.cc:798
+#: src/main.cc:456
 #, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o richiede un argomento nel formato chiave=valore, non «%s»\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Manca la virgola dopo il nome dell'etichetta «%s».\n"
+msgid "Invalid logger name \"%s\""
+msgstr "Operazione «%s» non ammessa"
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "STRANEZZA: ricevuto un codice di opzione sconosciuto\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "Pacchetto"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "Tutti i pacchetti"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5897,37 +5862,32 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "-u e -i non possono essere specificate contemporaneamente\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u e -i non sono ammesse in modalità riga di comando (es. con «install»)"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u e -i non possono essere specificate insieme a un comando"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Comando sconosciuto: «%s»\n"
+msgid "Unknown command \"%s\""
+msgstr "Comando sconosciuto: «%s»"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Eccezione non gestita: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5945,7 +5905,7 @@ msgstr "Cerca: "
 msgid "Search backwards for: "
 msgstr "Cerca all'indietro: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Campo minato"
 
@@ -6158,7 +6118,7 @@ msgstr "Encoding of mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Pacchetto"
 
@@ -6240,8 +6200,8 @@ msgstr "<N/D>"
 msgid "<none>"
 msgstr "<nessuna>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtuali"
@@ -6379,7 +6339,7 @@ msgid "Internal error: Default column string is unparsable"
 msgstr ""
 "Errore interno: impossibile leggere la stringa delle colonne predefinite"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Task"
 
@@ -6538,11 +6498,11 @@ msgstr ""
 "(%s)"
 
 # NdT: Tag/etichette di Debtags
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PACCHETTI SENZA ETICHETTE"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6553,11 +6513,6 @@ msgstr ""
 "database di debtags non è presente (l'installazione di debtag può correggere "
 "questo problema)."
 
-# NdT: Tag/etichette di Debtags
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "ETICHETTA MANCANTE"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Pacchetto sorgente: "
@@ -7186,7 +7141,7 @@ msgstr "Caricamento della cache"
 msgid "Really quit Aptitude?"
 msgstr "Uscire da Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Modifica il comportamento di aptitude"
 
@@ -7271,7 +7226,7 @@ msgstr ""
 msgid "License"
 msgstr "Licenza"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 "Mostra le condizioni in base alle quali sono permesse la copia e la "
@@ -7294,7 +7249,7 @@ msgstr "Aiuto in linea"
 msgid "View a brief introduction to aptitude"
 msgstr "Mostra una breve introduzione ad aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Aiuto"
 
@@ -7323,7 +7278,7 @@ msgstr "Manuale"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Visualizza un elenco delle domande più frequenti"
 
@@ -7365,15 +7320,15 @@ msgstr ""
 "senza rischi.%n%nRimuovere questa directory e tutto il suo contenuto? "
 "Scegliendo «No», questo messaggio non verrà mostrato di nuovo."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Mostra l'avanzamento dello scaricamento dei pacchetti"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Scaricamento dei pacchetti"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7385,35 +7340,35 @@ msgstr ""
 "del sistema%b. Si dovrebbe procedere con l'installazione solo se si è sicuri "
 "di quello che si sta facendo.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versione %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Continua comunque"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Annulla l'installazione"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Anteprima dell'installazione dei pacchetti"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Mostra e modifica le azioni da compiere"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alcuni pacchetti erano difettosi e sono stati corretti:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Non esistono soluzioni per questo problema di dipendenze."
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7422,7 +7377,7 @@ msgstr ""
 "Impossibile risolvere le dipendenze nel tempo stabilito. Premere «%s» per "
 "proseguire la ricerca"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7430,19 +7385,19 @@ msgstr ""
 "Per installare e rimuovere pacchetti servono i privilegi di amministratore, "
 "dei quali al momento si è privi. Passare all'account di root?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Diventa root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Non diventare root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Non ci sono pacchetti da installare, rimuovere o aggiornare."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7452,19 +7407,19 @@ msgstr ""
 "potrebbero venire aggiornati ma si è scelto di non farlo. Premere «U» per "
 "preparare un aggiornamento."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Aggiornamento dell'elenco dei pacchetti"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Mostra l'avanzamento dell'aggiornamento dell'elenco dei pacchetti"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Aggiornamento elenco"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7472,23 +7427,23 @@ msgstr ""
 "Per aggiornare l'elenco dei pacchetti servono i privilegi di amministratore, "
 "dei quali attualmente si è privi. Passare all'account di root?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Perdi tempo cercando di scovare le mine"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Pulire mentre è in corso uno scaricamento non è permesso"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Cancellazione dei file scaricati"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "I file dei pacchetti scaricati sono stati cancellati"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7497,11 +7452,11 @@ msgstr ""
 "Per aggiornare l'elenco dei pacchetti servono i privilegi di amministratore, "
 "dei quali attualmente si è privi. Passare all'account di root?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "Il file cache di apt non è disponibile; impossibile autopulire."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7510,7 +7465,7 @@ msgstr ""
 "I file dei vecchi pacchetti scaricati sono stati cancellati, liberando %sB "
 "di spazio su disco."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7519,135 +7474,135 @@ msgstr ""
 "Per aggiornare l'elenco dei pacchetti servono i privilegi di amministratore, "
 "dei quali attualmente si è privi. Passare all'account di root?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Nessun'altra soluzione."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Impossibile trovare una soluzione applicabile."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Impossibile trovare una soluzione nel tempo stabilito."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Risoluzione delle dipendenze"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Cerca delle soluzioni per le dipendenze non soddisfatte"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Impossibile aprire %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Impossibile salvare lo stato del risolutore"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Installa/rimuovi pacchetti"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Aggiorna l'elenco dei pacchetti"
 
 # NdT: La traduzione non è fedele ma è una voce di menu e deve essere breve
 # Il significato letterale è: "Segna (= Mark) [tutti i pacchetti che è
 # possibile aggiornare] come aggiornabili (= Upgradable)"
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Aggiorna ^tutti i pacchetti"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Dimentica i nuovi pacchetti"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Annu^lla azioni in attesa"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Pulisci la cache dei pacchetti"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "^Cancella i file vecchi"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "Ricarica ^la cache dei pacchetti"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Gioca a campo minato"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Diventa ^root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Esci"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Annulla"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Installa"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Richiede l'installazione e l'aggiornamento del pacchetto selezionato"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Rimuovi"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Richiede la rimozione del pacchetto selezionato"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Elimina"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Richiede la rimozione del pacchetto e dei suoi file di configurazione"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "Man^tieni"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Annulla ogni azione sul pacchetto selezionato"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Blocca"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 "Annulla ogni azione sul pacchetto selezionato, impedendo aggiornamenti futuri"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Installato ^automaticamente"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7655,11 +7610,11 @@ msgstr ""
 "Segna il pacchetto selezionato come installato automaticamente; verrà "
 "rimosso automaticamente se nessun altro pacchetto dipende da esso"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Installato ^manualmente"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7667,11 +7622,11 @@ msgstr ""
 "Segna il pacchetto selezionato come installato manualmente; non sarà rimosso "
 "a meno che non venga richiesto esplicitamente"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Proibisci versione"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7679,19 +7634,19 @@ msgstr ""
 "Impedisce che venga installata la versione candidata del pacchetto "
 "selezionato; le versioni successive saranno installate normalmente"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformazioni"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Mostra informazioni dettagliate sul pacchetto selezionato"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "M^odalità delle informazioni"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7701,93 +7656,93 @@ msgstr ""
 "estesa del pacchetto, un riassunto dello stato delle dipendenze, un'analisi "
 "del motivo per cui il pacchetto è richiesto."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Mostra il changelog Debian del pacchetto selezionato"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Esamina soluzione"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Esamina la soluzione proposta per le dipendenze non soddisfatte."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Applica ^soluzione"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Esegue le azioni contenute nella soluzione proposta."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "Soluzione s^uccessiva"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Seleziona la soluzione successiva per le dipendenze non soddisfatte."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "Soluzione ^precedente"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Seleziona la soluzione precedente per le dipendenze non soddisfatte."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "Pr^ima soluzione"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Seleziona la prima soluzione per le dipendenze non soddisfatte."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "U^ltima soluzione"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "Seleziona l'ultima soluzione tra quelle finora generate."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "^Rifiuta/autorizza"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Modifica lo stato di rifiuto dell'azione selezionata."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "^Approva/non richiedere"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Modifica lo stato di approvazione dell'azione selezionata."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Mostra pacchetto"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Mostra il pacchetto su cui avrà effetto la soluzione scelta"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Rifiuta modifica ^bloccati"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7795,137 +7750,137 @@ msgstr ""
 "Rifiuta tutte le azioni che modificano lo stato dei pacchetti bloccati o che "
 "installano versioni proibite"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Trova"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Cerca in avanti"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "^Trova all'indietro"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Cerca all'indietro"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Trova ^successivo"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Ripete l'ultima ricerca"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Trova successivo all'^indietro"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Ripete l'ultima ricerca nella direzione opposta"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Applica filtro"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Applica un filtro all'elenco dei pacchetti"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Rimuovi filtro"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Rimuove il filtro dall'elenco dei pacchetti"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Trova ^difettosi"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Trova il prossimo pacchetto con dipendenze non soddisfatte"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "Preferen^ze"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "Opzioni dell'interfaccia ^utente"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Cambia le impostazioni che riguardano l'interfaccia utente"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "Gestione delle ^dipendenze"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Cambia le impostazioni riguardo alla gestione delle dipendenze tra i "
 "pacchetti"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Varie"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Cambia altre impostazioni del programma"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Reimposta le opzioni"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Riporta tutte le impostazioni ai valori predefiniti"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "S^uccessivo"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Mostra la vista successiva"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "Pr^ecedente"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Mostra la vista precedente"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Chiudi"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Chiude questa vista"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Nuova ^vista dei pacchetti"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Crea una nuova vista predefinita dei pacchetti"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Controlla ^Raccomandati"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7933,88 +7888,88 @@ msgstr ""
 "Mostra i pacchetti che si raccomanda di installare, ma che non sono "
 "attualmente installati."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Nuovo e^lenco unico dei pacchetti"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 "Mostra tutti i pacchetti del sistema in un unico elenco senza categorie"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Consultazione per «^Debtags»"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Sfoglia i pacchetti in base alle informazioni di «Debtags»"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Consultazione per c^ategorie"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Sfoglia i pacchetti per categoria"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Informazioni"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Mostra le informazioni su questo programma"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Aiuto"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Mostra una breve guida in linea"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Manuale utente"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Mostra il manuale dettagliato del programma"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Nuovo"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Mostra le modifiche più importanti effettuate in ogni versione di "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licenza"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Azioni"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Cerca"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Viste"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8024,12 +7979,12 @@ msgstr ""
 "Rimuovi"
 
 # Put the appropriate key for Y/N choices here (lower case)
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "s"
 
 # Put the appropriate key for Y/N choices here (lower case)
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -8057,9 +8012,51 @@ msgstr "URL da usare per scaricare i changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Scaricamento del changelog"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "È possibile vedere i changelog solo dei pacchetti Debian ufficiali."
+# NdT: Tag/etichette di Debtags
+#~ msgid "MISSING TAG"
+#~ msgstr "ETICHETTA MANCANTE"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL da usare per scaricare i changelog"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Questa opzione controlla il modello usato per scaricare i changelog dal "
+#~ "sito web di Debian. Si dovrebbe aver bisogno di modificare questa "
+#~ "impostazione solo se i changelog vengono spostati su un URL diverso."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s non è un pacchetto Debian ufficiale: impossibile mostrarne il "
+#~ "changelog."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Impossibile trovare il pacchetto di nome «%s»"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Impossibile analizzare il modello %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "-q= richiede un argomento numerico\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "-q= richiede un argomento numerico, non «%s»\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o richiede un argomento nel formato chiave=valore, non «%s»\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "STRANEZZA: ricevuto un codice di opzione sconosciuto\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u e -i non possono essere specificate insieme a un comando"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "È possibile vedere i changelog solo dei pacchetti Debian ufficiali."
 
 #~ msgid "Err "
 #~ msgstr "Err "
@@ -8246,11 +8243,6 @@ msgstr "È possibile vedere i changelog solo dei pacchetti Debian ufficiali."
 #~ msgstr "Scaricamento del changelog"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Nessuna soluzione trovata."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Impossibile leggere la gerarchia dei pacchetti dal file %s"
diff --git a/po/ja.gmo b/po/ja.gmo
index 7508825f..f0a47a66 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index d37d5047..a7c055c1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -186,7 +186,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:26+0800\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -542,24 +542,10 @@ msgstr ""
 "ケージファイルを����パッケージキャッシュ�ら削除�るよ���り��。"
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "変更履歴�ダウンロード�用�る URL"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"��オプションを用�る��Debian �ウェブサイト�ら変更履歴をダウンロード�る"
-"��用�られるテンプレートを調整����。設定�変更�必���る���変更履"
-"歴 (changelog) ファイル� URL �変更����������ょ�。"
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "実行内容�プレビューを事��表示�る"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -568,14 +554,14 @@ msgstr ""
 "����aptitude ����実行�よ�����るアクション��約を表示�るよ��"
 "�り��。"
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 "パッケージ一覧を更新������常����パッケージ�「新����情報を消去"
 "�る"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -583,14 +569,14 @@ msgstr ""
 "��オプションを有効��る��(例�� 'u' を押��) パッケージ一覧を更新��"
 "後��aptitude �新�パッケージ�一覧を消去�るよ���り��。"
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "パッケージ�インストール���削除を行������常����パッケージ�「新"
 "����情報を消去�る"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -600,12 +586,12 @@ msgstr ""
 "行�やコマンドライン�ら�パッケージ�インストール・削除�実行�後��"
 "aptitude �新�パッケージ�一覧を消去�るよ���り��。"
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "読��り専用モード�最��変更���れ����警告を表示�る"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -614,11 +600,11 @@ msgstr ""
 "��オプションを有効�%B���%b��システム�変更を加�る権����場���"
 "パッケージ�状態を変更����� aptitude �警告を発���。"
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr "root 以外�ユーザ�特権�必��アクションを行��������警告�る"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -630,11 +616,11 @@ msgstr ""
 "�るよ���り��。����root ���ログイン�� root 権��アクションを実"
 "行�る���択�能��り��。"
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "アクション記録用�ファイル"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -646,11 +632,11 @@ msgstr ""
 "����後�部分��ログを標準入力�ら���るシェルコマンド���解釈�れ�"
 "�。"
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "パッケージ�択時�自動的��存関係を解決�る"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -662,11 +648,11 @@ msgstr ""
 "�。��ら����組�込���存関係解決器よりも���高速����場��よ�"
 "��最�����果����り�完全�失敗��り�る�能性も�り��。"
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "インストールや削除�����存関係�壊れ�パッケージを自動的�修復�る"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -678,13 +664,13 @@ msgstr ""
 "��択中�も�を自動的��用�るよ���り��。無効��る��aptitude ��壊"
 "れ��存関係�解決用�プロンプトを表示���。"
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "推奨パッケージを自動的�インストール�る"
 
 # It would be better to insert "automatically resolve dependncies" and
 # "Remove unused packages automatically" as variables.
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -703,13 +689,13 @@ msgstr ""
 "�る��何ら��インストール済�パッケージ�推奨�れ��る場��パッケージ�"
 "自動的��削除�れ��ん。"
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "使�れ����パッケージを自動的�削除�る"
 
 # It would be better to insert "Install recommended packages automatically"
 # as a variable.
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -727,11 +713,11 @@ msgstr ""
 "る��自動的�インストール�れ�パッケージ����も�何ら��インストール済"
 "�パッケージ�推奨�れ��る場���パッケージ�自動的��削除�れ��ん。"
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "絶対�自動的��削除������パッケージ"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -742,11 +728,11 @@ msgstr ""
 "パッケージ��使用�れ����パッケージ���削除対象��る����り��"
 "ん。"
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr "固定や�止�壊れるよ���存関係�解決方法�も許��る"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -768,15 +754,15 @@ msgstr ""
 "ケージ��存関係���れるパッケージを自動的�インストール�る場���固定を"
 "無視�������。"
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "UI オプション"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "�存関係�処�"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "��他"
 
@@ -875,7 +861,7 @@ msgstr "\"%s\" �ソースパッケージ�見��り��ん。\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "�存関係を満���������ん: %s\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -884,7 +870,7 @@ msgstr ""
 "注�: 仮想パッケージ \"%2$s\" を�供�る\n"
 "      \"%1$s\" �既�インストール�れ����。\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -894,7 +880,7 @@ msgstr ""
 "      \"%1$s\" �既�インストール予定��。\n"
 "\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -903,17 +889,22 @@ msgstr ""
 "\"%s\" �パッケージデータベース��存在���。\n"
 "���実在�るパッケージ�������パッケージ�らも�供�れ����ん。\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" ��以下�パッケージ�ら�供�れ��る仮想パッケージ��:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "インストール�るも�を一��ん�����。\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "パッケージ '%s' ��インストール候補��り��ん"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -922,62 +913,55 @@ msgstr ""
 "注�: 仮想パッケージ \"%2$s\" �代�り�\n"
 "      \"%1$s\" を�択���\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s ���求�れ��ージョン (%s) �既�インストール�れ����\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s ��在インストール�れ������更新�れ��ん。\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s �最新�ージョン���更新�れ��ん。"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s ��在インストール�れ�������インストール�れ��ん。\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "%s パッケージ�インストール�れ������削除�れ��ん\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "%s パッケージ�インストール�れ������更新を�止����ん\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "%s パッケージ�更新�能������更新を�止����ん\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "注�: タスク \"%s: %s\" をインストール�るよ��択���\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "'install' コマンドや 'forbid-version' コマンド�指定��る��パッケージ�"
-"�ージョン����。\n"
+"�ージョン����"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "'install' コマンド�指定��る��パッケージ�アーカイブ����。\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "'install' コマンド�指定��る��パッケージ�アーカイブ����"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -986,7 +970,7 @@ msgstr ""
 "\"%s\" パッケージ�見��り��ん���。\n"
 "パッケージ�� \"%s\" を�むも�� 40 以上�り��。\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -995,12 +979,12 @@ msgstr ""
 "\"%s\" パッケージ�見��り��ん���。\n"
 "����以下�パッケージ�� \"%s\" ���れ����:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "���説明� \"%s\" �マッ��るパッケージ�見��り��ん���\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -1018,7 +1002,7 @@ msgstr ""
 "\"%s\" �マッ��るパッケージ�見��り��ん���。\n"
 "����以下�パッケージ説明� \"%s\" ���れ����:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "�正�アクション文字��: '%c'\n"
@@ -1041,7 +1025,7 @@ msgstr "エラー "
 msgid "Changelog download failed: %s"
 msgstr "ダウンロード��ファイルを削除�����"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "sensible-pager �実行����ん。�れ�正常�機能���る Debian システム��"
@@ -1049,96 +1033,80 @@ msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "%s �公�� Debian パッケージ�������変更履歴を表示����ん。"
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "%s �変更履歴�見��り��ん"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "%s �変更履歴�見��り��ん"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "エラー: clean コマンド�引数を�り��ん\n"
+msgid "The clean command takes no arguments"
+msgstr "clean コマンド�引数を�り��ん"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "削除 %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr ""
 "ホームディレクトリ�調�られ�����/tmp/function_pkgs ��存�����!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "削除 %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "エラー: autoclean コマンド�引数を�り��ん\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "autoclean コマンド�引数を�り��ん"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "%sB �ディスク領域を解放���\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "%sB �ディスク領域を解放����\n"
 
 #  Should never happen.
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "�正��作��: %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "\"keep-all\" �後�想定外�パターン引数��り��"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
-"�存関係を安全�解決����ん。--full-resolver を���実行�������"
-"�。\n"
+"�存関係を安全�解決����ん。--full-resolver を���実行��������"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "中断。\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "download: ダウンロード�るパッケージを少���も一�指定������\n"
+msgid "download: you must specify at least one package to download"
+msgstr "download: ダウンロード�るパッケージを少���も一�指定������"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "パッケージ入手先一覧を読�込���ん���"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "\"%s\" ������パッケージ�見��り��ん"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1179,33 +1147,24 @@ msgid "[Working]"
 msgstr " [作業中]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 "extract-cache-entries: 少���も 1 ��引数 (ファイルを書�込むディレクト"
-"リ) �必���。\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "��よ��パッケージ��り��ん: \"%s\""
+"リ) �必���"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 "指定�れ�検索パターン��択�れ�パッケージ������何も���ん。\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "エラー: forget-new コマンド�引数を�り��ん\n"
+msgid "The forget-new command takes no arguments"
+msgstr "forget-new コマンド�引数を�り��ん"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "��パッケージ�新���情報を消去���\n"
@@ -1314,17 +1273,17 @@ msgstr "以下�パッケージ�更新�れ��:"
 msgid "The following partially installed packages will be configured:"
 msgstr "以下��インストール�完了�����パッケージ�設定�れ��:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "以下�必須パッケージ�削除�れ��!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "��アクション�よ��以下�必須パッケージ��存関係�壊れ��:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1334,16 +1293,16 @@ msgstr ""
 "      何を�よ�����る�本当��解�����場��先�進ん������"
 "ã‚“!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "I am aware that this is a very bad idea"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "先�進む場�� '%s' ���フレーズを入力������:\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1362,7 +1321,7 @@ msgstr ""
 "�����。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1371,7 +1330,7 @@ msgstr ""
 "*** 警告***   %s::Cmdline::Ignore-Trust-Violations � 'true' �\n"
 "              ����る����れら�信頼侵害を無視�����!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1384,7 +1343,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr "Go ahead and ignore the warning|Yes"
 
@@ -1393,100 +1352,100 @@ msgstr "Go ahead and ignore the warning|Yes"
 #. 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr "Abort instead of overriding the warning|No"
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "��警告を無視���地�も先�進����?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "先�進む場�� \"%s\" を�中断�る場�� \"%s\" を�入力������:"
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "入力を�識����ん。\"%s\" � \"%s\" を入力������。\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "以下�パッケージ�推奨�れ�����インストール�れ��ん:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "以下�パッケージ��案�れ�����インストール�れ��ん:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "インストール・削除・更新�れるパッケージ��り��ん。\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "更新: %lu 個�新�インストール: %lu 個�"
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "�インストール: %lu 個�"
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "ダウングレード: %lu 個�"
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "削除: %lu 個��留: %lu 個。\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "アーカイブ %2$s �イト中 %1$s �イトを�得�る必���り��。"
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "%s �イト�アーカイブを�得�る必���り��。"
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "展開後� %s �イト�ディスク領域�新��消費�れ��。\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "展開後� %s �イト�ディスク領域�解放�れ��。\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "表示�るパッケージ��り��ん -- 'i' �続��パッケージ�を入力�����"
 "�。\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "先�進む�� Return を押������。"
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "パッケージ�見��り��ん -- 'c' �続��パッケージ�を入力������。\n"
 
 # TRANSLATION-FIXME: �ん�感�?
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1495,33 +1454,33 @@ msgstr ""
 "パッケージ�見��り��ん -- 検索�根拠��るパッケージを必��応��入力"
 "���れ�続���説明���パッケージを入力������。\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
 # * Description of a command.
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "インストール��進���"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
 # * Description of a command.
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "中断��終了���"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
 # * Description of a command.
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1529,13 +1488,13 @@ msgstr ""
 "1 �以上�パッケージ�関�る情報を表示���。'i' �続��パッケージ�を入力"
 "������"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
 # * Description of a command.
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1543,43 +1502,43 @@ msgstr ""
 "1 �以上�パッケージ�関�る Debian �変更履歴を表示���。'c' �続��パッ"
 "ケージ�を入力������"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
 # * Description of a command.
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "�存関係情報を表示�る・���を切り替���"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
 # * Description of a command.
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "パッケージサイズ変更を表示�る・���を切り替���"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
 # * Description of a command.
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "�ージョン番�を表示�る・���を切り替���"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
 # * Description of a command.
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1588,27 +1547,27 @@ msgstr ""
 "ンストール�何故別�パッケージ�インストール�繋�る��を説明�よ����り"
 "���。"
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
 # * Description of a command.
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr "�存関係解決器を用���壊れ��存関係を修正���。"
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
 # * Description of a command.
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "ビジュアルインタフェース�移行���"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1620,47 +1579,47 @@ msgstr ""
 "��。��アクション��引数�指定��パッケージ�����用�れ��。以下�"
 "アクション�利用�能��:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+': パッケージをインストール"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M': パッケージをインストール��「自動的�インストール�れ��フラグを直�"
 "�添付"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-': パッケージを削除"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_': パッケージを完全削除"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=': パッケージを固定"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':': パッケージを完全�固定�る�����在�状態�一時的�固定"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M': 自動的�インストール�れ�����をパッケージ�添付"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m': 手動�インストール�れ�����をパッケージ�添付"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "'&BD': パッケージ�構築時�存���るパッケージをインストール"
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1668,29 +1627,29 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "パッケージ�自動�インストール�れ�����を示���。"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "コマンド:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1699,20 +1658,20 @@ msgstr ""
 "係を自分�力�手動�解決��も�����ん��'n' を入力��終了��も���"
 "��ん。"
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "先�進����? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "�れら��存関係を手動�解決����? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "応答��正��。有効�コマンドを入力�る� '?' �ヘルプを�照������。\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1721,7 +1680,7 @@ msgstr ""
 ">') を入力������。�����存関係自動解決ツールを使���る場�� 'R' "
 "を�中断�る場�� 'N' を�入力������。"
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1732,7 +1691,7 @@ msgstr ""
 "�存関係�情報を表示���。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1743,7 +1702,7 @@ msgstr ""
 "�存関係�情報を表示���ん。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1754,7 +1713,7 @@ msgstr ""
 "�ージョンを表示���。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1765,7 +1724,7 @@ msgstr ""
 "�ージョンを表示���ん。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1776,7 +1735,7 @@ msgstr ""
 "サイズ�変化を表示���。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1924,6 +1883,11 @@ msgstr ""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "\"%2$s\" �後��ージョン��� \"%1$s\" を入力������"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "��よ��パッケージ��り��ん: \"%s\""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -2075,7 +2039,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr "�存関係を解決���������存関係解決器�作��れ����ん。"
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -2103,7 +2067,7 @@ msgstr "�存関係�自動解決を放棄��手動��解決�戻��
 msgid "The following commands are available:"
 msgstr "以下�コマンド�利用�能��:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "�存関係解決器�状態を書�込む出力ファイル: "
 
@@ -2136,7 +2100,7 @@ msgstr ""
 "*** エラー: 致命的�例外�発生��検索�中断����。検索を続行�る\n"
 "            ����能����一部�解決方法��到�����ん。"
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -2145,26 +2109,25 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "更新�����存関係�解決�����ん (解決方法�見��り��ん���)。"
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "更新�����存関係�解決�����ん (%s)。"
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "%s � iconv �失敗����。\n"
+msgid "iconv of %s failed"
+msgstr "%s � iconv �失敗����"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "search: 検索語を少���も一�与���れ��り��ん\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "search: 検索語を少���も一�与���れ��り��ん"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2208,7 +2171,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "以下�パッケージ��満��れ�����存関係��り��:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2432,7 +2395,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "�供"
 
@@ -2446,15 +2409,9 @@ msgstr "説明: "
 msgid "Homepage: "
 msgstr "ホームページ: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "パッケージ�場所�見��り��ん: %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "パターンをパース����ん: %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "パッケージ�見��り��ん"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2465,14 +2422,13 @@ msgstr "パッケージ�ダウンロード・インストール・削除を行
 msgid "Internal Error, Ordering didn't finish"
 msgstr "内部エラー��。並����終�り��ん���"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "ダウンロード�れ�廃止済��ファイルを削除�����"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "エラー: update コマンド�引数を�り��ん\n"
+msgid "The update command takes no arguments"
+msgstr "update コマンド�引数を�り��ん"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2491,128 +2447,149 @@ msgstr ""
 "%s: 引数�少�����。少���もタグ����パッケージを指定�����"
 "�。\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "%s �インストール候補��ージョン�見��り��ん\n"
+msgid "No candidate version found for %s"
+msgstr "%s �インストール候補��ージョン�見��り��ん"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr ""
-"%s ���在��ージョンもインストール候補��ージョンも見��り��ん\n"
+msgid "No current or candidate version found for %s"
+msgstr "%s ���在��ージョンもインストール候補��ージョンも見��り��ん"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr " \"%2$s\" パッケージ�アーカイブ \"%1$s\" �見��り��ん\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr " \"%2$s\" パッケージ�アーカイブ \"%1$s\" �見��り��ん"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "パッケージ \"%2$s\" ��ージョン \"%1$s\" �見��り��ん\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "パッケージ \"%2$s\" ��ージョン \"%1$s\" �見��り��ん"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "内部エラー: �正�値 %i � cmdline_find_ver �渡�れ���!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "内部エラー: �正�値 %i � cmdline_find_ver �渡�れ���!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "パッケージ�アーカイブ��ージョンを�時��指定����ん\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "パッケージ�アーカイブ��ージョンを�時��指定����ん"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "%s �変更履歴�見��り��ん"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "�存関係破�� %d 個 [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "更新� %d 個 [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "新�� %d 個 [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "�在�状態: %F。"
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "新��廃止�れ�パッケージ� %d 個�り��。"
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "新��廃止�れ�パッケージ� %d 個�り��:"
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "タグ� \"%s\" �後�コンマ��り��ん"
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "パッケージ�場所�見��り��ん: %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "%s �変更履歴�見��り��ん"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "注�: タスク \"%s: %s\" をインストール�るよ��択���\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "%s �変更履歴�見��り��ん"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "パッケージ: "
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "ソースパッケージ: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "アーカイブ"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "search: 検索語を少���も一�与���れ��り��ん\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2635,7 +2612,7 @@ msgstr "�在"
 msgid "Candidate"
 msgstr "候補"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "インストール"
 
@@ -2738,23 +2715,21 @@ msgstr "%s をインストール�る�由�見��り��ん。\n"
 msgid "Packages requiring %s:"
 msgstr "%s を必須��るパッケージ:"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "\"%s\" ������パッケージ�存在���ん。"
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "一部�マッ�パターンをパース����ん。"
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 "%s: ��コマンド��少���も 1 ��引数 (������対象��るパッケージ) "
-"を指定�る必���り��。\n"
+"を指定�る必���り��"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2780,11 +2755,11 @@ msgstr "�存関係未解決"
 msgid "UNAVAILABLE"
 msgstr "入手��能"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "ã‚¿ã‚°"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "ユーザタグ"
 
@@ -2995,32 +2970,32 @@ msgstr ""
 "ル�既�パッケージをインストール中�����味��。読��り専用モード�開�"
 "����。パッケージ�状態を変更��も�れ��存�れ��ん!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 msgid "allowed"
 msgstr "�択��よ��"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "メイン"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -3094,36 +3069,44 @@ msgstr ""
 "検察層 \"%s\" ��正�� (\"conflict\"�\"minimum\"�整数���れ�も�り��"
 "ん)。"
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "パッケージ�キャッシュ�利用��能��。パッケージ�ダウンロードやインストー"
 "ル�����ん。"
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "内部エラー: ダウンロード�るパッケージ�一覧を作�����ん"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "%s を�得����ん���: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"�����アーカイブ��得����ん。aptitude update を実行�る� --fix-"
+"missing オプションを付��試��������。"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "入手��能�パッケージ�修正����ん"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "パッケージをインストール����ん���。復旧を試�����:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3297,14 +3280,14 @@ msgstr ""
 "\n"
 "ログ完了。\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
 # * Message used as 'title' for the ui_download_manager.
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "パッケージをダウンロード中"
@@ -3417,18 +3400,18 @@ msgstr ""
 "パッケージインデックスファイル�壊�れ����。%s パッケージ�ファイル� "
 "(Filename:) フィールド��り��ん。"
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "%s �変更履歴"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "変更履歴�ダウンロード�失敗����: %s"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "変更履歴�ダウンロード�失敗����: %s"
@@ -3479,26 +3462,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "変更履歴�ダウンロード�失敗����: %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "タグ�データベースを構築�����"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "利用�能�更新��り��ん"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "利用�能�更新��り��ん"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3647,47 +3631,47 @@ msgid "_File"
 msgstr "ファイル(_F)"
 
 # * Description of an item.
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "実行�れ����インストールや削除を実行���"
 
 # * Description of an item.
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "パッケージ�新���ージョン����確����"
 
 # * Description of an item.
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "更新時�固定�れ��更新�能パッケージ�����を����"
 
 # * Description of an item.
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "��パッケージ�「新����情報を消去���"
 
 # * Description of an item.
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "実行�れ����インストール・削除・固定・更新を�り消���"
 
 # * Description of an item.
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "以�ダウンロード��パッケージファイルを削除���"
 
 # * Description of an item.
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "も�やダウンロード����パッケージファイルを削除���"
 
 # * Description of an item.
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "パッケージ�キャッシュを�度読�込���"
 
 # * Description of an item.
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3698,7 +3682,7 @@ msgstr ""
 "���在�設定����れ��"
 
 # * Description of an item.
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "プログラムを終了���"
 
@@ -3707,7 +3691,7 @@ msgid "E_dit"
 msgstr "編集(_E)"
 
 # * Description of an item.
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "最後�行��パッケージ管��作����一連��作を�り消���"
 
@@ -3739,7 +3723,7 @@ msgid "_Help"
 msgstr "ヘルプ(_H)"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr "ダッシュボード"
 
@@ -3748,20 +3732,20 @@ msgstr "ダッシュボード"
 msgid "Update"
 msgstr "æ›´æ–°"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "パッケージ"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "プレビュー"
 
 # * Menu item on the first line.
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "�題解決"
 
@@ -3944,7 +3928,7 @@ msgid "Fix Manually"
 msgstr "手動�修正"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "æ›´æ–°"
 
@@ -4475,11 +4459,11 @@ msgstr "インストール済�"
 msgid "Reinstall"
 msgstr "�インストール"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "ダウングレード"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "削除"
 
@@ -4512,7 +4496,7 @@ msgstr "パッケージ一覧を更新�る�� root ��る必���り
 msgid "Download already running."
 msgstr "ダウンロード�既�実行中��。"
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "パッケージ一覧�更新���インストール�実行��在行�れ����。"
 
@@ -4581,40 +4565,40 @@ msgid "Asking whether to replace the configuration file %s"
 msgstr "設定ファイル %s を置���る����を尋���"
 
 # * Message used as 'title' for the ui_download_manager.
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "パッケージをダウンロード中"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr "壊れ��るパッケージ"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr "壊れ��るパッケージを表示"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr "�存関係を解決�る"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "%d 個�パッケージ�壊れ����。"
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr "変更を表示"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr "変更��用"
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4623,60 +4607,60 @@ msgstr[0] "%d 個�パッケージ�インストール"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%d 個�パッケージ�削除"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr "ダウンロードサイズ: %s�イト。"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr "%s �タグ:\n"
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr "��機能���実装�れ����ん。"
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr "実装�れ����ん"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr "インストール/更新"
 
 # * Item.
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr "完全削除"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "一時固定"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "固定"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr "自動�設定"
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr "手動�設定"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr "自動状態を切り替�"
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr "ユーザインタフェース定義ファイル %s/aptitude.glade を読�込���ん。"
@@ -4712,7 +4696,7 @@ msgstr "情報"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4759,15 +4743,15 @@ msgid "Cache reloading, please wait..."
 msgstr "キャッシュを�読�込������。�待�����..."
 
 # * Menu item on the first line.
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr "検索�����..."
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr "画�を調整�����"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "画�を構築�����"
@@ -5460,108 +5444,109 @@ msgstr "整列�種類��明��: '%s'"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "��を用��並�替��則�引数�����"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "長��ゼロ�文字列�並�替��則������無効��"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "並�替��則�記述内� '(' �対応�����ん"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "並�替��則�種類��正��: '%s'"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "\"%ls\" �後�マル��イト文字列をデコード����ん"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "\"%s\" �後�ワイドキャラクタをデコード����ん"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s (コンパイル日時: %s %s)\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "コンパイラ: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "コンパイル環境:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt ��ージョン: %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  NCurses ��ージョン: �明\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  NCurses ��ージョン: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++ ��ージョン: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Ept サ�ート: 有効\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Ept サ�ート: 無効\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt ��ージョン: %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt ��ージョン: %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Ept サ�ート: 無効\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s (コンパイル日時: %s %s)\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Ept サ�ート: 無効\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5569,35 +5554,35 @@ msgstr ""
 "\n"
 "�在��ライブラリ��ージョン:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  NCurses ��ージョン: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  cwidget ��ージョン: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  apt ��ージョン: %s\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "使用方法: aptitude [-S ファイル�] [-u|-i]"
 
 # * Description of action in the commandline help.
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "          aptitude [オプション] <アクション> ..."
 
 # * Description of action in the commandline help.
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5608,44 +5593,44 @@ msgstr ""
 "\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - パッケージをインストール・更新���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - パッケージを削除���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - パッケージ�設定ファイルを削除���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - パッケージを固定���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - パッケージ�固定を解除���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 " markauto     - 自動的�インストール�れ�����をパッケージ�����。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr ""
@@ -5653,7 +5638,7 @@ msgstr ""
 
 # * Description of action in the commandline help.
 # TRANSLATION-FIXME: 原文�文末�ピリオド���
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5663,20 +5648,20 @@ msgstr ""
 "�。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr ""
 " update       - 新��よ�更新�能�パッケージ�一覧をダウンロード���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - 安全�更新を行���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5685,62 +5670,62 @@ msgstr ""
 " full-upgrade - パッケージ�インストールや削除を伴��能性��る更新を行��"
 "�。\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr " build-dep    - パッケージ�構築�存関係をインストール���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - ��パッケージ�「新����情報を消去���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - ��や正�表��パッケージを検索���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - パッケージ�����詳細�情報を表示���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - パッケージ�����詳細�情報を表示���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - ダウンロード済��パッケージファイルを消去���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr ""
 " autoclean    - ���ダウンロード済��パッケージファイルを消去���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - パッケージ�変更履歴を表示���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - パッケージ� .deb ファイルをダウンロード���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5751,7 +5736,7 @@ msgstr ""
 "                ��) �インストール���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:219
+#: src/main.cc:216
 #, fuzzy, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5767,7 +5752,7 @@ msgstr ""
 "                ����説明を表示���\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5784,49 +5769,49 @@ msgstr ""
 "                ���説明を表示���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  オプション: \n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h                ��ヘルプ�文章��。\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr " --gui          設定�無効��れ���も GTK GUIを使用���。\n"
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr " --no-gui       利用�能����も GTK GUI を使���ん。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h                ��ヘルプ�文章��。\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, fuzzy, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr " --gui          設定�無効��れ���も GTK GUIを使用���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 " -s             アクション�シミュレート��行��実際��実行���ん。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -5835,14 +5820,14 @@ msgstr ""
 "                ��ん。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:237
+#: src/main.cc:234
 #, fuzzy, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr ""
 " -P                確�やアクション����常�プロンプトを出���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5851,7 +5836,7 @@ msgstr ""
 "�。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5862,7 +5847,7 @@ msgstr ""
 "                   �����。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5873,21 +5858,21 @@ msgstr ""
 "                   �。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w <幅>           検索�果�表示フォーマット�幅を指定���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             �存関係�壊れ�パッケージを�極的�修復�よ�����。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
@@ -5895,20 +5880,20 @@ msgstr ""
 "�。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             自動的�変更�れ�パッケージ��存関係を表示���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z             �パッケージ�インストールサイズ�変更を表示���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5917,7 +5902,7 @@ msgstr ""
 " -v                付加的�情報を表示��� (何�も�情報��供�れ��)。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
@@ -5925,7 +5910,7 @@ msgstr ""
 " -t [<リリース>]   インストール�るパッケージ�基��リリースを設定���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:248
+#: src/main.cc:245
 #, fuzzy, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5934,14 +5919,14 @@ msgstr ""
 " -q                コマンドラインモード�進行状�を�一表示���ん。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o <キー>=<値>    ��「<キー>�を��設定オプションを直接設定���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:251
+#: src/main.cc:248
 #, fuzzy, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5952,7 +5937,7 @@ msgstr ""
 "                   ��。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
@@ -5960,25 +5945,25 @@ msgstr ""
 "�。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr ""
 " -u              : 起動時�新��パッケージ一覧をダウンロード���。\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr "                  (端末インタフェース��)"
 
 # * Description of action in the commandline help.
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             : 起動時�インストールを行���。\n"
 
 # * Description of action in the commandline help.
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
@@ -5986,49 +5971,49 @@ 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:393
+#: src/main.cc:359
 msgid "trace"
 msgstr "trace"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 msgid "debug"
 msgstr "debug"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:399
+#: src/main.cc:365
 msgid "info"
 msgstr "info"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 msgid "warn"
 msgstr "warn"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:405
+#: src/main.cc:371
 msgid "error"
 msgstr "error"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 msgid "fatal"
 msgstr "fatal"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr "off"
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
@@ -6038,77 +6023,57 @@ msgstr ""
 "\"�\"error\"�\"fatal\"�\"off\" ���れ��期待�れ��)。"
 
 #  Should never happen.
-#: src/main.cc:488
+#: src/main.cc:456
 #, c-format
-msgid "Invalid logger name \"%s\"."
-msgstr "ロガー� \"%s\" ��正��。"
+msgid "Invalid logger name \"%s\""
+msgstr "ロガー� \"%s\" ��正��"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "-q= �後�番��期待�れ��\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "-q= �後�番��期待�れ����%s �与�られ���\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o �� <キー>=<値> �形��引数�必�����%s �与�られ���\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "タグ� \"%s\" �後�コンマ��り��ん。\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "���議: 未知�オプションコードを���り���\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr "no-summary"
 
-#: src/main.cc:1027
+#: src/main.cc:781
 msgid "first-package"
 msgstr "first-package"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr "first-package-and-type"
 
-#: src/main.cc:1031
+#: src/main.cc:785
 msgid "all-packages"
 msgstr "all-packages"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr "�存�ージョン付������パッケージ"
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -6119,37 +6084,41 @@ msgstr ""
 "\"�\"first-package-and-type\"�\"all-packages\"�\"all-packages-with-dep-"
 "versions\" �期待�れ��。"
 
-#: src/main.cc:1079
+#: src/main.cc:831
+#, fuzzy
+#| msgid ""
+#| "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may "
+#| "be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr ""
 "--auto-clean-on-startup�--clean-on-startup�-i�-u ���れ� 1 ���を指定"
 "�能��\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
+#, fuzzy
+#| msgid ""
+#| "-u, -i, and --clean-on-startup may not be specified in command-line mode "
+#| "(eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u�-i�--clean-on-startup �コマンドラインモード�指定�る��� ('install' "
 "��も���) ����ん"
 
-#: src/main.cc:1105
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u�-i�--clean-on-startup �コマンド��も�指定�る�������ん"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "�明�コマンド \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "�明�コマンド \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "��������例外: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -6167,7 +6136,7 @@ msgstr "検索: "
 msgid "Search backwards for: "
 msgstr "後方を検索: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "マインスイーパ"
 
@@ -6382,7 +6351,7 @@ msgstr "Encoding of mine-help-ja.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "パッケージ"
 
@@ -6463,8 +6432,8 @@ msgstr "<N/A>"
 msgid "<none>"
 msgstr "<��>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "仮想"
@@ -6598,7 +6567,7 @@ msgstr "\"%ls\" ã�®å¾Œã�®ãƒ‘ッケージ表示フォーマットをコード変æ
 msgid "Internal error: Default column string is unparsable"
 msgstr "内部エラー: デフォルト�行文字列�解���能��"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "タスク"
 
@@ -6755,11 +6724,11 @@ msgstr "match ã�®æ·»å­—ã�¯ 1 以上ã�§ã�ªã��ã�¦ã�¯ã�„ã�‘ã�ªã�„ã�®ã�§ã€�\"%s\" ã�
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "match �添字 %ls �大�����。利用�能�グループ� (%s) ��"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "タグ���パッケージ"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6770,10 +6739,6 @@ msgstr ""
 "debtags データベース��り��ん (debtags データベース���場���debtags "
 "をインストール�る��題�解決�れる��ょ�)。"
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "タグ��り��ん"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "ソースパッケージ: "
@@ -7413,7 +7378,7 @@ msgstr "キャッシュを読�込ん����"
 msgid "Really quit Aptitude?"
 msgstr "本当� Aptitude を終了����?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "aptitude �振舞�を変更���"
 
@@ -7493,7 +7458,7 @@ msgstr ""
 msgid "License"
 msgstr "ライセンス"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "aptitude �コピーや�布を行�際�従����件を表示���"
 
@@ -7514,7 +7479,7 @@ msgstr "オンラインヘルプ"
 msgid "View a brief introduction to aptitude"
 msgstr "aptitude �使�方�関�る簡��手引�を表示���"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "ヘルプ"
 
@@ -7545,7 +7510,7 @@ msgstr "マニュアル"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "よ��る質��一覧を表示���"
 
@@ -7584,16 +7549,16 @@ msgstr ""
 "����? \"No\" を�ん�場�����メッセージ�二度�表示�れ���り��。"
 
 # * Message used as 'longtitle' for the ui_download_manager.
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "パッケージダウンロード�進行状�を表示���"
 
 # * Message used as 'tablabel' for the ui_download_manager.
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "パッケージ�ダウンロード"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7605,35 +7570,35 @@ msgstr ""
 "�。�れ�自分��よ�����る���������る場�����インストール"
 "を続�る����ょ�。%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [�ージョン %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "本当�先�進む"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "インストールを中断�る"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "インストール�るパッケージをプレビュー���"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "実行�るアクション�表示・調整を行���"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "一部�パッケージ��存関係�壊れ�����修復�れ���:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "�れら��存関係��題を解決�る方法�存在���ん!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7642,7 +7607,7 @@ msgstr ""
 "�存関係�解決を試�����タイムアウト��り��� (�試行�る�� \"%s\" "
 "�入力������)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7650,19 +7615,19 @@ msgstr ""
 "パッケージ�インストールや削除�必��管�者権���在�り��ん。root ��り"
 "���?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "root ��る"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "root ��ら��"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "インストール・削除・更新予定�パッケージ��り��ん。"
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7673,44 +7638,44 @@ msgstr ""
 "力��更新�準備を������。"
 
 # * Message used as 'title' for the ui_download_manager.
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "パッケージ一覧を更新中"
 
 # * Message used as 'longtitle' for the ui_download_manager.
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "パッケージ一覧更新�進行状�を表示���"
 
 # * Message used as 'tablabel' for the ui_download_manager.
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "一覧�更新"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 "パッケージ一覧�更新�必��管�者権���在�り��ん。root ��り���?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "地雷探�������"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "ダウンロード�進行���る間�廃止�れ�ファイル�消去�����ん"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "ダウンロード��ファイルを削除�����"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "ダウンロード��パッケージファイル�既�削除�れ����"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7718,11 +7683,11 @@ msgstr ""
 "パッケージキャッシュ�消去��管�者権��必������������れを得�"
 "���ん。root ��り���?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "apt �キャッシュファイル�入手��能��。autoclean ����ん。"
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7731,7 +7696,7 @@ msgstr ""
 "ダウンロード�れ�廃止済��パッケージファイルを削除��%s �イト�ディスク領"
 "域を解放����。"
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7739,143 +7704,143 @@ msgstr ""
 "廃止済��ファイル�削除��管�者権��必������������れを得��"
 "��ん。root ��り���?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "解決方法��れ以上�り��ん。"
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "�用�る解決方法�見��り��ん。"
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "解決方法を探��������タイムアウト��り���。"
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "�存関係を解決�る"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "解決�れ�����存関係�解決方法を探�"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "%ls を開���ん"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "�存関係解決器�状態�ダンプ中�エラー�生����"
 
 # * Item.
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "パッケージ�インストール・削除 (^I)"
 
 # * Item.
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "パッケージ一覧�更新 (^U)"
 
 # * Item.
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "更新�能パッケージ����を添付 (^G)"
 
 # * Item.
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "新�パッケージ一覧�消去 (^F)"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "未実行アクション��り消� (^E)"
 
 # * Item.
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "パッケージ�キャッシュ�消去 (^C)"
 
 # * Item.
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "廃止�れ�ファイルを一掃�る (^O)"
 
 # * Item.
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "パッケージ�キャッシュ��読�込� (^R)"
 
 # * Item.
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "マインスイーパ��� (^P)"
 
 # * Item.
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "root ��る (^B)"
 
 # * Item.
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "終了 (^Q)"
 
 # * Menu item on the first line.
 # * Item.
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "�り消�"
 
 # * Item.
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "インストール (^I)"
 
 # * Description of an item.
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "�在�択中�パッケージ��インストール���更新用��を����"
 
 # * Item.
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "削除 (^R)"
 
 # * Description of an item.
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "�在�択中�パッケージ�削除用��を����"
 
 # * Item.
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "完全削除 (^P)"
 
 # * Description of an item.
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "�在�択中�パッケージ���設定ファイル��削除用��を����"
 
 # * Item.
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "一時固定 (^K)"
 
 # * Description of an item.
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "�択中�パッケージ���らゆるアクションを�り消���"
 
 # * Item.
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "固定 (^H)"
 
 # * Description of an item.
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7883,12 +7848,12 @@ msgstr ""
 "�択中�パッケージ���らゆるアクションを�り消��今後�更新�らも防���"
 
 # * Item.
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "自動的�インストール�れ�����を添付 (^A)"
 
 # * Description of an item.
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7898,12 +7863,12 @@ msgstr ""
 "�り��"
 
 # * Item.
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "手動�インストール������を添付 (^M)"
 
 # * Description of an item.
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7912,12 +7877,12 @@ msgstr ""
 "動�削除����りパッケージ�削除�れ��よ���り��"
 
 # * Item.
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "�ージョン��止 (^F)"
 
 # * Description of an item.
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7927,22 +7892,22 @@ msgstr ""
 "ストール�れ��"
 
 # * Item.
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "情報 (^N)"
 
 # * Description of an item.
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "�択中�パッケージ�関�る�より詳細�情報を表示���"
 
 # * Item.
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "パッケージ情報�切り替� (^Y)"
 
 # * Description of an item.
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7953,72 +7918,72 @@ msgstr ""
 "示����"
 
 # * Item.
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "変更履歴 (^C)"
 
 # * Description of an item.
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "�択中�パッケージ�更新履歴を表示���"
 
 # * Item.
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "解決方法�検討 (^E)"
 
 # * Description of an item.
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "�存関係��題�対����在�択中�解決方法を試���。"
 
 # * Item.
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "解決方法��用 (^S)"
 
 # * Description of an item.
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "�在�択中�解決方法���れるアクションを実行���。"
 
 # * Item.
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "次�解決方法 (^N)"
 
 # * Description of an item.
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "�存関係��題�対���次�解決方法を�択���。"
 
 # * Item.
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "��解決方法 (^P)"
 
 # * Description of an item.
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "�存関係��題�対�����解決方法を�択���。"
 
 # * Item.
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "最��解決方法 (^F)"
 
 # * Description of an item.
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "�存関係��題�対���最��解決方法を�択���。"
 
 # * Item.
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "最後�解決方法 (^L)"
 
 # * Description of an item.
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -8026,42 +7991,42 @@ msgstr ""
 "発生���存関係��題�対���今����最後��る解決方法を�択���。"
 
 # * Item.
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "拒��る・���を切り替� (^R)"
 
 # * Description of an item.
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "�在�択中�アクションを拒��る・���を切り替���。"
 
 # * Item.
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "承��る・���を切り替� (^A)"
 
 # * Description of an item.
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "�在�択中�アクションを承��る・���を切り替���。"
 
 # * Item.
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "対象を表示 (^V)"
 
 # * Description of an item.
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "�択中�アクション�よ��影響を��るパッケージを表示���"
 
 # * Item.
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "破�����る固定を拒� (^H)"
 
 # * Description of an item.
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -8070,167 +8035,167 @@ msgstr ""
 "ル��り�るアクションを���拒����"
 
 # * Item.
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "下を検索 (^F)"
 
 # * Description of an item.
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "下方を検索���"
 
 # * Item.
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "上を検索 (^F)"
 
 # * Description of an item.
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "上方を検索���"
 
 # * Item.
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "��検索を繰り返� (^A)"
 
 # * Description of an item.
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "最後�行��検索を繰り返���"
 
 # * Item.
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "��検索を逆方��繰り返� (^B)"
 
 # * Description of an item.
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "最後�行��検索を逆方��繰り返���"
 
 # * Item.
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "表示を制� (^L)"
 
 # * Description of an item.
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "パッケージ一覧�フィルタを����"
 
 # * Item.
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "表示制�を解除 (^U)"
 
 # * Description of an item.
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "パッケージ一覧�フィルタを解除���"
 
 # * Item.
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "壊れ��存関係を検索 (^B)"
 
 # * Description of an item.
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "解決�����存関係��る�次�パッケージを探���"
 
 # * Item.
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "設定 (^P)"
 
 # * Item.
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "UI オプション (^U)"
 
 # * Description of an item.
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "ユーザインターフェース�影響�る設定を変更���"
 
 # * Item.
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "�存関係�処� (^D)"
 
 # * Description of an item.
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "パッケージ�存関係�処�方法�関�る設定を変更���"
 
 # * Item.
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "��他 (^M)"
 
 # * Description of an item.
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "��他�設定を変更���"
 
 # * Item.
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "オプションを元�戻� (^R)"
 
 # * Description of an item.
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "����設定をシステム�デフォルト�戻���"
 
 # * Item.
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "次 (^N)"
 
 # * Description of an item.
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "次�画�を表示���"
 
 # * Item.
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "� (^P)"
 
 # * Description of an item.
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "��画�を表示���"
 
 # * Item.
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "閉�る (^C)"
 
 # * Description of an item.
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "��画�を閉���"
 
 # * Item.
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "新�パッケージ画� (^V)"
 
 # * Description of an item.
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "デフォルト�パッケージ画�を新��作����"
 
 # * Item
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "推奨を監査 (^R)"
 
 # * Description of an item
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -8239,106 +8204,106 @@ msgstr ""
 "を表示���"
 
 # * Item.
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "平��パッケージ一覧を新��作� (^F)"
 
 # * Description of an item.
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "システム�全パッケージをカテゴリ分�����一�一覧表�表示���"
 
 # * Item.
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Debtags 表示を新��作� (^D)"
 
 # * Description of an item.
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Debtags �データを用��パッケージを表示���"
 
 # * Item.
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "カテゴリ別表示を新��作� (^B)"
 
 # * Description of an item.
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "カテゴリ別�パッケージを表示���"
 
 # * Item.
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "��プログラム���� (^A)"
 
 # * Description of an item.
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "��プログラム�����情報を表示���"
 
 # * Item.
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "ヘルプ (^H)"
 
 # * Description of an item.
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "オンラインヘルプを表示���"
 
 # * Item.
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "ユーザマニュアル (^M)"
 
 # * Description of an item.
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "プログラム�詳細�マニュアルを表示���"
 
 # * Item.
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "FAQ (^F)"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "�知ら� (^N)"
 
 # TRANSLATION-FIXME: The original message should be fixed, but...
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr " ���ージョン���る���変更点を表示���"
 
 # * Item.
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "ライセンス (^L)"
 
 # * Menu item on the first line.
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "アクション"
 
 # * Menu item on the first line.
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "検索"
 
 # * Menu item on the first line.
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "オプション"
 
 # * Menu item on the first line.
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "表示"
 
 # * Menu item on the second line.
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8347,11 +8312,11 @@ msgstr ""
 "%ls: メニュー  %ls: ヘルプ  %ls: 終了  %ls: 更新  %ls: パッケージ� �得/導"
 "入/削除 "
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -8379,9 +8344,49 @@ msgstr "変更履歴�ダウンロード�失敗����: %s"
 msgid "Downloading the changelog of %s"
 msgstr "変更履歴をダウンロード�����"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "公�� Debian パッケージ��変更履歴を閲覧����。"
+#~ msgid "MISSING TAG"
+#~ msgstr "タグ��り��ん"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "変更履歴�ダウンロード�用�る URL"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "��オプションを用�る��Debian �ウェブサイト�ら変更履歴をダウンロード"
+#~ "�る��用�られるテンプレートを調整����。設定�変更�必���る���"
+#~ "変更履歴 (changelog) ファイル� URL �変更����������ょ�。"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s �公�� Debian パッケージ�������変更履歴を表示����ん。"
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "\"%s\" ������パッケージ�見��り��ん"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "パターンをパース����ん: %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "-q= �後�番��期待�れ��\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "-q= �後�番��期待�れ����%s �与�られ���\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o �� <キー>=<値> �形��引数�必�����%s �与�られ���\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "���議: 未知�オプションコードを���り���\n"
+
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr ""
+#~ "-u�-i�--clean-on-startup �コマンド��も�指定�る�������ん"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "公�� Debian パッケージ��変更履歴を閲覧����。"
 
 #~ msgid "Err "
 #~ msgstr "エラー "
diff --git a/po/km.gmo b/po/km.gmo
index b0519145..1c383221 100644
--- a/po/km.gmo
+++ b/po/km.gmo
diff --git a/po/km.po b/po/km.po
index 7818eb5b..10db08e0 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude_po_km\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:26+0800\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -309,66 +309,55 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL ដែល�្រូវប្រើ​​ដើម្បី​ទាញ​យក​កំណ�់​ហ��ុ​ការ​ផ្លាស់ប្ដូរ"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "បង្ហាញ​ទិដ្ឋភាព​ជាមុន​នៃ​អ្វី​ដែល​�្រូវ​ធ្វើ មុន​នឹង​ធ្វើ​វា"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "បំ​ភ្ល�ច​កញ្ចប់​ណាដែល​ \"�្មី\" នៅ​ព�ល​ណា​ដែល​បញ្ជី​កញ្ចប់​�្រូវ​បាន​ធ្វើ​ឲ្យ​ទាន់សម�យ"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "បំភ្ល�ច​កញ្ចប់ណាដែល​ \"�្មី​\" ​នៅព�ល​ណា​ដែល​កញ្ចប់​�្រូវ​បាន​ដំឡើង ឬ យកច�ញ"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "កុំ​បង្ហាញ​ព្រមាន ព�ល​ធ្វើការ​ផ្លាស់ប្ដូរ​លើក​ដំបូង​នៅ​ក្នុង​របៀប​បាន​�ែ​អាន"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr "ព្រមាន ព�ល​ប៉ុនប៉ង​អនុវ�្�​សកម្មភាព​មួយ​ដែល​�្រូវការ​សិទ្ធិ​ជា root ក្នុង​នាម​ជា​អ្នក​ប្រើ​ធម្ម�ា"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -376,11 +365,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "ឯកសារ​ដែល�្រូវ​ចុះ​កំណ�់​ហ��ុ​សកម្មភាព​ទៅ​ក្នុង"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -388,11 +377,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "ដោះស្រាយ​ភាព​អាស្រ�យ​នៃ​កញ្ចប់​​ដោយ​ស្វ�យប្រវ�្�ិ ​​នៅ​ព�លជ្រើស​វា"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -400,11 +389,11 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "ជួសជុល​កញ្ចប់​ដែល​បាន​�ូច​ដោយ​ស្វ�យប្រវ�្�ិ ​មុន​ព�លដំឡើង​ ឬ យកច�ញ​"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -412,12 +401,12 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 #, fuzzy
 msgid "Install recommended packages automatically"
 msgstr "ដំឡើង​កញ្ចប់​ដែល​បាន​ផ្�ល់​អនុសាសន�​ដោយស្វ�យប្រវ�្�ិ​"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -428,11 +417,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "យក​កញ្ចប់​មិន​​ប្រើច�ញ​​ដោយ​ស្វ�យប្រវ�្�ិ​"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -443,22 +432,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -471,17 +460,17 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 #, fuzzy
 msgid "UI options"
 msgstr "ជម្រើស​ចំណុចប្រទាក់"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 #, fuzzy
 msgid "Dependency handling"
 msgstr "ការ​ដោះស្រាយ​ភាព​អាស្រ�យ"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "ផ្ស�ងៗ​"
 
@@ -586,7 +575,7 @@ msgstr "មិន​អាច​រកឃើញ​ប�ណ្ណសារ \"%s\
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "មិន​អាច​រាយ​ឯកសារ​ក្នុង \"%s\" បាន​ឡើយ"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -595,7 +584,7 @@ msgstr ""
 "ចំណាំ ៖ \"%s\" ដែល​ផ្ដល់​កញ្ចប់​និម្មិ�\n"
 "      \"%s\", �្រូវ​បាន​ដំឡើង​រួច​ហើយ ។\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -604,7 +593,7 @@ msgstr ""
 "ចំណាំ ៖ \"%s\" ដែល​ផ្ដល់​កញ្ចប់​និម្មិ�\n"
 "      \"%s\", កំពុង​�ែ​�្រូវ​បាន​ដំឡើង ។\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -613,17 +602,23 @@ msgstr ""
 "មាន \"%s\" រួច​ហើយ​នៅ​ក្នុង​មូលដ្ឋានទិន្នន�យ​កញ្ចប់\n"
 "ប៉ុន្�ែ​វា​មិន​មែន​ជា​កញ្ចប់​ពិ�​ឡើយ ហើយ​ក�​មិន​មាន​កញ្ចប់​ណា​ផ្ដល់​វា​ដែរ ។\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" ជា​កញ្ចប់​និម្មិ�  ​ដែល​បាន​ផ្ដល់​ដោយ ៖\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "អ្នក​�្រូវ​�ែ​ជ្រើស​កញ្ចប់​មួយ ដើម្បី​ដំឡើង ។\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "កញ្ចប់ %s មិន​�្រូវ​បាន​ដំឡើង​ឡើយ ដូច្ន�ះ​មិន​អាច​ហាម​កុំ​ឲ្យ​ធ្វើ​ឲ្យ​ប្រសើរ​បាន​ឡើយ\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -632,61 +627,54 @@ msgstr ""
 "ចំណាំ ៖ ជ្រើស \"%s\" ជំនួស​ឲ្យ\n"
 "      កញ្ចប់​និម្មិ� \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s បានដំឡើងរួច​ហើយ​នៅ​កំណែ​ដែលបានស្នើ​ (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "បច្ចុប្បន្ន %s មិន�្រូវបានដំឡើង​ឡើយ ដូច្ន�ះ​វានឹងមិន�្រូវបាន​ដំឡើង​ម្ដងទៀ�ឡើយ ។\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s បានដំឡើងរួច​ហើយ​នៅ​កំណែ​ដែលបានស្នើ​ (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "បច្ចុប្បន្ន %s មិន�្រូវបានដំឡើង​ឡើយ ដូច្ន�ះ​វានឹងមិន�្រូវបាន​ដំឡើង​ម្ដងទៀ�ឡើយ ។\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "កញ្ចប់ %s មិន​�្រូវ​បាន​ដំឡើង​ឡើយ ដូច្ន�ះ​វា​នឹង​មិន​�្រូវ​បាន​យក​ច�ញ​ឡើយ\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "កញ្ចប់ %s មិន​�្រូវ​បាន​ដំឡើង​ឡើយ ដូច្ន�ះ​មិន​អាច​ហាម​កុំ​ឲ្យ​ធ្វើ​ឲ្យ​ប្រសើរ​បាន​ឡើយ\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "កញ្ចប់ %s មិន​អាច​ធ្វើ​ឲ្យ​ប្រសើរ​បាន​ឡើយ ដូច្ន�ះ​មិន​អាច​ហាម​កុំ​ឲ្យ​ធ្វើ​ឲ្យ​ប្រសើរ​បាន​ឡើយ\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "ចំណាំ ៖ ជ្រើស​ភារកិច្ច​​ \"%s ៖ %s\" សម្រាប់​ការ​ដំឡើង​\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
-"អ្នក​អាច​បញ្ជាក់​�ែ​កំណែ​កញ្ចប់ ដោយ​ប្រើ​ពាក្យបញ្ជា 'install' ឬ 'forbid-version' ប៉ុណ្ណោះ ។\n"
+"អ្នក​អាច​បញ្ជាក់​�ែ​កំណែ​កញ្ចប់ ដោយ​ប្រើ​ពាក្យបញ្ជា 'install' ឬ 'forbid-version' ប៉ុណ្ណោះ ។"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "អ្នក​អាច​បញ្ជាក់​�ែ​ប�ណ្ណសារ​កញ្ចប់ ដោយ​ប្រើ​ពាក្យបញ្ជា 'install' ប៉ុណ្ណោះ ។\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "អ្នក​អាច​បញ្ជាក់​�ែ​ប�ណ្ណសារ​កញ្ចប់ ដោយ​ប្រើ​ពាក្យបញ្ជា 'install' ប៉ុណ្ណោះ ។"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -695,7 +683,7 @@ msgstr ""
 "មិន​អាច​រកក​ញ្ចប់​ \"%s\" ឃើញ​ឡើយ ហើយ​មាន​កញ្ចប់​ជាង ៤០\n"
 "ដែល​មាន \"%s\" នៅ​ក្នុង​ឈ្មោះ​របស់​ពួក​វា ។\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -704,12 +692,12 @@ msgstr ""
 "មិន​អាច​រក​កញ្ចប់​ \"%s\" ឃើញ​ឡើយ ។ ទោះ​យ៉ាង​ណា\n"
 "កញ្ចប់​�ាង​ក្រោម​មាន \"%s\" នៅ​ក្នុង​ឈ្មោះ​របស់​ពួក​វា ៖\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "មិន​អាច​រកឃើញ​កញ្ចប់ ដែល​ឈ្មោះ ឬ ស�ចក្ដីពណ៌នា​របស់​វា​ដូច \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -727,7 +715,7 @@ msgstr ""
 "មិន​អាច​រក​កញ្ចប់​ដូច \"%s\" ឡើយ ។ ទោះ​យ៉ាង​ណា កញ្ចប់​�ាង​ក្រោម\n"
 "មាន \"%s\" នៅ​ក្នុង​ការ​ពិពណ៌នា​របស់​ពួក​វា ៖\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "�ួអក្សរ​អំពើ '%c' មិន​�្រឹម�្រូវ\n"
@@ -750,30 +738,24 @@ msgstr "Err "
 msgid "Changelog download failed: %s"
 msgstr "កំណ�់ហ��ុ​ការ​ផ្លាស់ប្ដូរ​របស់ %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "មិន​អាច​ប្រ�ិប�្�ិ sensible-pager បាន​ឡើយ ។ �ើ​ន�ះ​គឺ​ជា​ប្រព�ន្ធ​ដ�បៀន ដែល​កំពុង​�ែ​ដំណើរការ​ឬ ?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s ​មិន​មែន​ជាកញ្ចប់​ដ�បៀន​ផ្លូវការ​ឡើយ ដូច្ន�ះ​មិន​អាច​បង្ហាញ​កំណ�់ហ��ុ​ការ​ផ្លាស់ប្ដូរ​របស់​វា​បាន​ឡើយ ។"
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "មិនអាចរក​ឃើញកំណ�់​ហ��ុ​ការផ្លាស់ប្ដូរ​សម្រាប់ %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "មិនអាចរក​ឃើញកំណ�់​ហ��ុ​ការផ្លាស់ប្ដូរ​សម្រាប់ %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, fuzzy, c-format
-msgid "E: The clean command takes no arguments\n"
+#, fuzzy
+msgid "The clean command takes no arguments"
 msgstr "E ៖ ពាក្យបញ្ជា update មិន​�្រូវការ​អាគុយម៉ង់​ឡើយ\n"
 
 #: src/cmdline/cmdline_clean.cc:66
@@ -781,69 +763,62 @@ msgstr "E ៖ ពាក្យបញ្ជា update មិន​�្រូវ
 msgid "Del %s* %spartial/*\n"
 msgstr "Del %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr "មិន​អាច​ស្វែងរក​��​ផ្ទះ​របស់​អ្នក​ឃើញ​ឡើយ ។ កំពុង​រក្សាទុក​ទៅ /tmp/function_pkgs !"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Del %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, fuzzy, c-format
-msgid "E: The autoclean command takes no arguments\n"
+#: src/cmdline/cmdline_clean.cc:127
+#, fuzzy
+msgid "The autoclean command takes no arguments"
 msgstr "E ៖ ពាក្យបញ្ជា update មិន​�្រូវការ​អាគុយម៉ង់​ឡើយ\n"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "អាច​នឹង​ធ្វើ​ឲ្យ​�ាស​ទំន�រ​បាន %s បៃ\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "បាន​ធ្វើ​ឲ្យ​�ាស​ទំន�រ %s បៃ\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "ប្រ�ិប�្�ិការ %s មិន​�្រឹម�្រូវ"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "មិន​បាន​ឃើញ​អាគុយម៉ង់​លំនាំ​នៅ​បន្ទាប់​ពី \"keep-all\" ឡើយ"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, fuzzy, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+#, fuzzy
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr "មិនអាច​ដោះស្រាយ​​ភាពអាស្រ�យ​បានឡើយ​ ។"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "បោះបង់ ។\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "ទាញយក​ ៖ អ្នក​�្រូវ​�ែ​បញ្ជាក់​កញ្ចប់​យ៉ាង�ិច​មួយ​ដើម្បី​ទាញ​យក\n"
+msgid "download: you must specify at least one package to download"
+msgstr "ទាញយក​ ៖ អ្នក​�្រូវ​�ែ​បញ្ជាក់​កញ្ចប់​យ៉ាង�ិច​មួយ​ដើម្បី​ទាញ​យក"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "មិន​អាច​រក​កញ្ចប់​​​មួយ​ដែល​​មាន​ឈ្មោះ \"%s\" ឡើយ"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -882,30 +857,22 @@ msgid "[Working]"
 msgstr " [កំពុង​ធ្វើការ​]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "មិន​មាន​កញ្ចប់ \"%s\" ឡើយ"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, fuzzy, c-format
-msgid "E: The forget-new command takes no arguments\n"
+#, fuzzy
+msgid "The forget-new command takes no arguments"
 msgstr "E ៖ ពាក្យបញ្ជា update មិន​�្រូវការ​អាគុយម៉ង់​ឡើយ\n"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "នឹង​ភ្ល�ច​មា​ន​កញ្ចប់​អ្វី​�្លះ​ដែល​�្មី​\n"
@@ -1016,17 +983,17 @@ msgstr "កញ្ចប់​áž�ាង​ក្រោម នឹង​áž�្រáž
 msgid "The following partially installed packages will be configured:"
 msgstr "កញ្ចប់​�ាង​ក្រោម នឹង​�្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ ៖"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "កញ្ចប់​ចាំបាច់​�ាង​ក្រោម នឹង​�្រូវ​បាន​យកច�ញ !\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "កញ្ចប់​ចាំបាច់​�ាង​ក្រោម នឹង​�្រូវ​បាន​ធ្វើ​ឲ្យ​�ូច​ដោយ​សកម្មភាព​ន�ះ ៖\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1035,16 +1002,16 @@ msgstr ""
 "ព្រមាន ៖ ការ​អនុវ�្�​សកម្មភាព​ន�ះ នឹង​អាច​ធ្វើ​ឲ្យ​ប្រព�ន្ធ​របស់​អ្នក​�ូច !\n"
 "         សូម​កុំ​បន្�​ឲ្យ​សោះ លុះ�្រា​�ែ​អ្នក​ដឹង​ច្បាស់​�ា​អ្នក​កំពុង​�ែ​ធ្វើ​អ្វី !\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "�្ញុំ​ដឹង​ហើយ​�ា ន�ះ​គឺ​ជា​គំនិ�​ដ�​អាក្រក់​បំផុ�"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "ដើម្បី​បន្� សូម​វាយ​ឃ្លា \"%s\" ៖\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1061,7 +1028,7 @@ msgstr ""
 "អ្នក​នឹង​ធ្វើ​អ្វី​ប៉ុណ្ណោះ ។\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1070,7 +1037,7 @@ msgstr ""
 "*** ព្រមាន ***   កំពុង​�ែ​មិន​អើពើ​ការ​បំពាន​ស�ចក្ដី​ទុកចិ�្�​ទាំងន�ះ ព្រោះ\n"
 "                  %s::CmdLine::Ignore-Trust-Violations ស្មើ 'true' !\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 #, fuzzy
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1084,7 +1051,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1093,199 +1060,199 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "�ើ​អ្នកចង់​មិន​អើពើ​ការព្រមាន​ន�ះ ហើយ​បន្�​ទៅ​ទៀ�​ឬ ?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "ដើម្បី​បន្� សូម​វាយ \"%s\" ។ ដើម្បី​បញ្ឈប់ សូម​វាយ \"%s\" ៖ "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "មិន​ស្គាល់​ការ​បញ្ចូល ។ សូម​បញ្ចូល \"%s\" ឬ \"%s\" ។\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "កញ្ចប់​�ាង​ក្រោម �្រូវ​បាន​ផ្ដល់អនុសាសន� ប៉ុន្�ែ​នឹង​មិន​�្រូវ​បាន​ដំឡើង​ឡើយ ៖\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "កញ្ចប់​�ាង​ក្រោម �្រូវ​បាន​ស្នើ ប៉ុន្�ែ​នឹង​មិន​�្រូវ​បាន​ដំឡើង​ឡើយ ៖\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "មិន​មាន​កញ្ចប់​�្រូវ​បាន​ដំឡើង ធ្វើ​ឲ្យ​ប្រសើរ ឬ​ក�​យក​ច�ញ​ឡើយ ។\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "បាន​ធ្វើ​ឲ្យ​កញ្ចប់​ប្រសើរ​ចំនួន %lu, បាន​ដំឡើង​�្មី​ចំនួន %lu, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu �្រូវ​បាន​ដំឡើង​ឡើង​វិញ "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu ​�្រូវបាន​បន្ទាប"
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu �្រូវ​យកច�ញ ហើយ %lu មិន​បាន​ធ្វើ​ឲ្យ​ប្រសើរ ។\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "�្រូវការ​យក %sបៃ/%sបៃ នៃ​ប�ណ្ណសារ ។ "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "�្រូវការ​យក %sបៃ នៃ​ប�ណ្ណសារ ។ "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "បន្ទាប់​ពី​ពន្លា​រួច %s បៃ នឹង​�្រូវ​បាន​ប្រើ ។\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "បន្ទាប់​ពី​ពន្លា​រួច %s បៃ នឹង​�្រូវ​បាន​ស្រាយ​ច�ញ ។\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "មិន​មាន​កញ្ចប់​ដើម្បី​បង្ហាញ​ឡើយ -- សូមបញ្ចូល​ឈ្មោះ​កញ្ចប់ នៅ​បន្ទាប់​ពី 'i' ។\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "ចុចគ្រាប់ចុច បញ្ចូល ដើម្បី​បន្� ។"
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "រក​មិន​ឃើញ​កញ្ចប់​ឡើយ -- សូមបញ្ចូល​ឈ្មោះ​កញ្ចប់ នៅ​បន្ទាប់​ពី 'c' ។\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "បន្�​ការដំឡើង​"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "បញ្ឈប់ ហើយ​ច�ញ"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr "បង្ហាញ​ព��៌មាន​អំពី​កញ្ចប់មួយ​ ឬ ច្រើន ។ ឈ្មោះ​កញ្ចប់​គួរ​�ែ​នៅ​បន្�​ពី 'i'"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
 msgstr "បង្ហាញ​កំណ�់ហ��ុ​ការ​ផ្លាស់ប្ដូរ​ដ�បៀន​របស់​កញ្ចប់​មួយ ឬ ច្រើន ។ ឈ្មោះ​កញ្ចប់​គួរ​�ែ​នៅ​បន្ទាប់​ពី 'c'"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "បិទបើក ការ​បង្ហាញ​អំពី​ព��៌មាន​ភាព​អាស្រ�យ"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "បិទបើក ការ​បង្ហាញ​អំពី​ការ​ផ្លាស់ប្ដូរ​នៅ​ក្នុង​ទំហំ​កញ្ចប់"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "បិទបើក ការ​បង្ហាញ​ល��​កំណែ"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "បញ្ចូល​​ចំណុច​ប្រទាក់​និម្មិ�​ព�ញល�ញ"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1296,45 +1263,45 @@ msgstr ""
 "កញ្ចប់(ឬ លំនាំ) មួយ ឬ ច្រើន ។ អំពើ​នឹង​�្រូវ​បាន​អនុវ�្�​ចំពោះ​កញ្ចប់​ទាំងអស់ ដែល​អ្នក​រាយ ។ មាន​អំពើ​ដូច​�ាង​"
 "ក្រោម ៖"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' ដើម្បី​ដំឡើង​កញ្ចប់​"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr "'+M' ដើម្បី​ដំឡើង​កញ្ចប់ ហើយ​បោះទង់សម្គាល់​ពួក​វា​ភ្លាមៗ​�ា បាន​ដំឡើង​ដោយ​ស្វ�យប្រវ�្�ិ"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' ដើម្បី​យក​កញ្ចប់​ច�ញ"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' ដើម្បី​លុបបំបា�់​កញ្ចប់​"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' ដាក់​កញ្ចប់​នៅ​ក្នុង​ស្�ានភាព​រង់ចាំ"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':' ដើម្បី​រក្សា​កញ្ចប់​នៅ​ដដែល ដោយ​មិន​ដាក់​ពួក​វា​ក្នុង​ស្�ានភាព​រង់ចាំ"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' ដើម្បី​សម្គាល់​កញ្ចប់​�ា​បាន​ដំឡើង​ដោយ​ស្វ�យប្រវ�្�ិ"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' ដើម្បី​សម្គាល់​កញ្ចប់​�ា​បាន​ដំឡើង​ដោយ​ដៃ"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1342,53 +1309,53 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' ដើម្បី​សម្គាល់​កញ្ចប់​�ា​បាន​ដំឡើង​ដោយ​ស្វ�យប្រវ�្�ិ"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "ពាក្យ​បញ្ជា:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "�ើ​អ្នក​ចង់​បន្�​ឬ ? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "ចម្លើយ�ប​មិន​�្រឹម�្រូវ​ឡើយ ។ សូម​បញ្ចូល​ពាក្យបញ្ជា​�្រឹម�្រូវ​មួយ ឬ '?' ដើម្បី​មើល​ជំនួយ ។\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1399,7 +1366,7 @@ msgstr ""
 "ព��៌មាន​អំពី​ភាពអាស្រ�យ ​នឹង​�្រូវ​បាន​បង្ហាញ ។\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1410,7 +1377,7 @@ msgstr ""
 "ព��៌មាន​អំពី​ភាព​អាស្រ�យ នឹង​មិន​�្រូវ​បាន​ដំឡើង​ឡើយ ។\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1421,7 +1388,7 @@ msgstr ""
 "កំណែ​នឹង​�្រូវ​បាន​បង្ហាញ ។\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1432,7 +1399,7 @@ msgstr ""
 "កំណែ​នឹង​មិន​�្រូវ​បាន​បង្ហាញ​ឡើយ ។\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1443,7 +1410,7 @@ msgstr ""
 "ការ​ផ្លាស់ប្ដូរ​ទំហំ នឹង​�្រូវ​បាន​បង្ហាញ ។\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1570,6 +1537,11 @@ msgstr "បាន​រំពឹង​យ៉ាង​ហោច​ណាស់​
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "បាន​រំពឹង​កំណែ​នៅ​បន្ទាប់​ពី \"%s\""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "មិន​មាន​កញ្ចប់ \"%s\" ឡើយ"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1716,7 +1688,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1744,7 +1716,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "ពាក្យ​បញ្ជា​ទាំងអស់​ន�ះ​អាច​ប្រើ​បាន​ ៖"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "ឯកសារ​ដែល​�្រូវ​សរស�រ​សភាព​របស់​កម្មវិធី​ដោះស្រាយ​ទៅ​កាន់ ៖ "
 
@@ -1774,7 +1746,7 @@ msgid ""
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1783,25 +1755,24 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "មិន​អាច​ដោះស្រាយ​ភាព​អាស្រ�យ​បាន​ឡើយ ​!  កំពុង​បោះបង់ចោល​..."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "មិនអាច​ដោះស្រាយ​​ភាពអាស្រ�យ​បានឡើយ​ ។"
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "iconv របស់ %s បាន​បរាជ�យ​ហើយ ។\n"
+msgid "iconv of %s failed"
+msgstr "iconv របស់ %s បាន​បរាជ�យ​ហើយ ។"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "ស្វែងរក​ ៖ អ្នក​�្រូវ​�ែ​ផ្ដល់​យ៉ាង​ហោច​ណាស់​ពាក្យស្វែងរក​មួយ ។\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "ស្វែងរក​ ៖ អ្នក​�្រូវ​�ែ​ផ្ដល់​យ៉ាង​ហោច​ណាស់​ពាក្យស្វែងរក​មួយ ។"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1844,7 +1815,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "កញ្ចប់​�ាង​ក្រោម មាន​ភាព​អាស្រ�យ​�ុសឆ្គង ៖\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<ទទ�>"
@@ -2067,7 +2038,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "ផ្�ល់​ឲ្យ​"
 
@@ -2081,15 +2052,9 @@ msgstr "ស�ចក្ដីពណ៌នា ៖ "
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "មិន​អាច​រកទី�ាំង​កញ្ចប់ %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "មិន​អាច​ញែក​លំនាំ %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "រក​កញ្ចប់​មិន​ឃើញ"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2100,13 +2065,14 @@ msgstr "នឹង​ទាញយក/ដំឡើង/យក​កញ្ចប់â
 msgid "Internal Error, Ordering didn't finish"
 msgstr "មាន​កំហុស​�ាង​ក្នុង ។ ការ​រៀប​លំដាប់​មិន​បាន​បញ្ចប់​ឡើយ"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "កំពុង​លុប​ឯកសារ​ដែល​បាន​ទាញយក ហើយ​ដែល​លែង​ប្រើ"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
+#, fuzzy
+#| msgid "E: The update command takes no arguments\n"
+msgid "The update command takes no arguments"
 msgstr "E ៖ ពាក្យបញ្ជា update មិន​�្រូវការ​អាគុយម៉ង់​ឡើយ\n"
 
 #: src/cmdline/cmdline_user_tag.cc:65
@@ -2124,132 +2090,154 @@ msgstr "មិន​អាច​រកឃើញ​កំណែ \"%s\" សម្á
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
-#, c-format
-msgid "No candidate version found for %s\n"
-msgstr "រក​មិន​ឃើញ​កំណែ​សាកល្បង​សម្រាប់​ %s ឡើយ\n"
-
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "រកមិន​ឃើញ​កំណែ​បច្ចុប្បន្ន ឬ​កំណែ​សាកល្បង​សម្រាប់ %s\n"
+msgid "No candidate version found for %s"
+msgstr "រក​មិន​ឃើញ​កំណែ​សាកល្បង​សម្រាប់​ %s ឡើយ"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "មិន​អាច​រកឃើញ​ប�ណ្ណសារ \"%s\" សម្រាប់​កញ្ចប់ \"%s\" ឡើយ\n"
+msgid "No current or candidate version found for %s"
+msgstr "រកមិន​ឃើញ​កំណែ​បច្ចុប្បន្ន ឬ​កំណែ​សាកល្បង​សម្រាប់ %s"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "មិន​អាច​រកឃើញ​កំណែ \"%s\" សម្រាប់​កញ្ចប់ \"%s\" ឡើយ\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "មិន​អាច​រកឃើញ​ប�ណ្ណសារ \"%s\" សម្រាប់​កញ្ចប់ \"%s\" ឡើយ"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "កំហុស​�ាង​ក្នុង ៖ បាន​ហុច​�ម្លៃ %i មិន​�្រឹម�្រូវ ទៅ​ឲ្យ cmdline_find_ver !\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "មិន​អាច​រកឃើញ​កំណែ \"%s\" សម្រាប់​កញ្ចប់ \"%s\" ឡើយ"
 
-#: src/cmdline/cmdline_util.cc:239
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "អ្នក​មិន​អាច​បញ្ជាក់​ទាំង​ប�ណ្ណសារ និង ទាំង​កំណែ​សម្រាប់​កញ្ចប់​មួយ​បាន​ឡើយ ។\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "កំហុស​�ាង​ក្នុង ៖ បាន​ហុច​�ម្លៃ %i មិន​�្រឹម�្រូវ ទៅ​ឲ្យ cmdline_find_ver !"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "មិនអាចរក​ឃើញកំណ�់​ហ��ុ​ការផ្លាស់ប្ដូរ​សម្រាប់ %s"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "អ្នក​មិន​អាច​បញ្ជាក់​ទាំង​ប�ណ្ណសារ និង ទាំង​កំណែ​សម្រាប់​កញ្ចប់​មួយ​បាន​ឡើយ ។"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "មិន​អាច​រកទី�ាំង​កញ្ចប់ %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "មិនអាចរក​ឃើញកំណ�់​ហ��ុ​ការផ្លាស់ប្ដូរ​សម្រាប់ %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "ចំណាំ ៖ ជ្រើស​ភារកិច្ច​​ \"%s ៖ %s\" សម្រាប់​ការ​ដំឡើង​\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "មិនអាចរក​ឃើញកំណ�់​ហ��ុ​ការផ្លាស់ប្ដូរ​សម្រាប់ %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "កញ្ចប់​"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "កញ្ចប់​ប្រភព ៖ "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "ប�ណ្ណសារ"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "ស្វែងរក​ ៖ អ្នក​�្រូវ​�ែ​ផ្ដល់​យ៉ាង​ហោច​ណាស់​ពាក្យស្វែងរក​មួយ ។\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2275,7 +2263,7 @@ msgstr ""
 msgid "Candidate"
 msgstr "កំណែសាកល្បង"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "ដំឡើង"
 
@@ -2379,21 +2367,19 @@ msgstr "មិន​អាច​រក​ដំណោះស្រាយ​ដើ
 msgid "Packages requiring %s:"
 msgstr "កញ្ចប់​ដែល​ផ្អែក​លើ %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, fuzzy, c-format
 msgid "No package named \"%s\" exists."
 msgstr "មិន​អាច​រក​កញ្ចប់​​​មួយ​ដែល​​មាន​ឈ្មោះ \"%s\" ឡើយ"
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 #, fuzzy
 msgid "Unable to parse some match patterns."
 msgstr "មិន​អាច​ញែក​លំនាំ %s"
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 
 #: src/cmdline/cmdline_why.h:212
@@ -2420,11 +2406,11 @@ msgstr "មិនព�ញចិ�្�"
 msgid "UNAVAILABLE"
 msgstr "មិនមាន"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "ស្លាក"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 #, fuzzy
 msgid "User Tags"
 msgstr "ស្លាក"
@@ -2626,31 +2612,31 @@ msgstr ""
 "មិន​អាច​ចាក់​សោ​ឯកសារ​ឃ្លាំង​សម្ងា�់​បាន​ឡើយ ។ កំពុង​បើក​ក្នុង​របៀប​បាន​�ែអាន ។ ការ​ផ្លាស់ប្ដូរ​ដែល​អ្នក​បាន​"
 "ធ្វើ​ទៅ​លើ​ស្�ានភាព​របស់​​​កញ្ចប់​នឹង​មិន​�្រូវ​បាន​ការពារ​ឡើយ !"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "ចាំបាច់"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2717,34 +2703,40 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr "មិន​មាន​ឃ្លាំងសម្ងា�់​កញ្ចប់​ឡើយ ។ មិន​អាច​ទាញយក និង ដំឡើង​កញ្ចប់​បាន​ឡើយ ។"
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "កំហុស​�ាង​ក្នុង ៖ មិន​អាច​បង្កើ�​បញ្ជី​របស់​កញ្ចប់​ដើម្បី​ទាញ​យក​បាន​ឡើយ"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, fuzzy, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "បរាជ�យ​ក្នុង​ការ​ប្ដូរ​ឈ្មោះ %s ទៅជា %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "មិន​អាច​កែ​កញ្ចប់​ដែល​មិន​មាន​បាន​ឡើយ"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "បាន​បរាជ�យ​ក្នុង​ការ​ដំឡើង​កញ្ចប់ ។ កំពុង​�ែ​ព្យាយាម​សង្គ្រោះ ៖"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2894,13 +2886,13 @@ msgstr ""
 "\n"
 "ចុះកំណ�់ហ��ុ​ចប់​សព្វគ្រប់ ។\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "កំពុង​ទាញ​យក​កញ្ចប់​"
@@ -3009,18 +3001,18 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "�ូច​ឯកសារ​លិបិក្រម​កញ្ចប់​ហើយ ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់ %s ។"
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, fuzzy, c-format
 msgid "Changelog of %s"
 msgstr "កំណ�់ហ��ុ​ការ​ផ្លាស់ប្ដូរ​របស់ %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "URL ដែល�្រូវប្រើ​​ដើម្បី​ទាញ​យក​កំណ�់​ហ��ុ​ការ​ផ្លាស់ប្ដូរ"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL ដែល�្រូវប្រើ​​ដើម្បី​ទាញ​យក​កំណ�់​ហ��ុ​ការ​ផ្លាស់ប្ដូរ"
@@ -3069,26 +3061,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "មិន​អាច​ញែក​លំនាំ %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "កំពុង​បង្កើ�​មូលដ្ឋាន​ទិន្នន�យ​ស្លាក"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "មិន​បានដំឡើង​"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "មិន​បានដំឡើង​"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3237,39 +3230,39 @@ msgstr ""
 msgid "_File"
 msgstr "បិទ​"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "អនុវ�្�​ការ​ដំឡើង និង ការ​យកច�ញ​ទាំងអស់ ដែល​មិន​ទាន់​សម្រ�ច"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "ពិនិ�្យរក​កំណែ​�្មី​របស់​កញ្ចប់"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "សម្គាល់​កញ្ចប់​ទាំងអស់​ដែល​អាច​ធ្វើ​ឲ្យ​ប្រសើរ​បាន"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "បំភ្ល�ច​កញ្ចប់​ដែល \"�្មី\""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "បោះបង់​ការ​ដំឡើង ការ​យកច�ញ ការ​ទុក និង ធ្វើ​ឲ្យ​ប្រសើរ​ដែល​មិន​ទាន់​សម្រ�ច ។"
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "លុប​ឯកសារ​កញ្ចប់ ដែល​�្រូវ​បាន​ទាញយក​ពី​មុន"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "លុប​ឯកសារ​កញ្ចប់ ដែល​លែង​ទាញយក"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "ផ្ទុក​ឃ្លាំងសម្ងា�់​កញ្ចប់​ឡើង​វិញ"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3279,7 +3272,7 @@ msgstr ""
 "រ�់ 'su' ដើម្បី​ក្លាយជា root ។ បន្ទាប់​មក​កម្មវិធី​នឹង​�្រូវ​បាន​ចាប់ផ្ដើម​ឡើង​វិញ ប៉ុន្�ែ​ការ​កំណ�់​របស់​អ្នក​នឹង​"
 "�្រូវ​បាន​ការពារ"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "ច�ញពី​កម្មវិធី​"
 
@@ -3287,7 +3280,7 @@ msgstr "ច�ញពី​កម្មវិធី​"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "មិន​ធ្វើ​ប្រ�ិប�្�ិការ​ ឬ ក្រុម​ប្រ�ិប�្�ិការ​ចុងក្រោយ ដែល​ទាក់ទង​នឹង​កញ្ចប់"
 
@@ -3321,7 +3314,7 @@ msgid "_Help"
 msgstr "ជំនួយ"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3330,19 +3323,19 @@ msgstr ""
 msgid "Update"
 msgstr "ធ្វើ​ឲ្យ​បញ្ជី​ទាន់សម�យ"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "កញ្ចប់​"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "មើល​ជា​​​មុន"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "កម្មវិធី​ដោះស្រាយ"
 
@@ -3529,7 +3522,7 @@ msgid "Fix Manually"
 msgstr "ដោយ​ដៃ"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "ធ្វើ​ឲ្យ​ប្រសើរ"
 
@@ -4063,11 +4056,11 @@ msgstr "បាន​ដំឡើង"
 msgid "Reinstall"
 msgstr "ដំឡើង​ឡើង​វិញ​"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "បន្ទាប​"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "យក​ច�ញ"
 
@@ -4103,7 +4096,7 @@ msgstr "អនុវ�្�​�ម្រង​ទៅ​កាន់​បញ
 msgid "Download already running."
 msgstr "កំពុង​ទាញយក..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "កំពុង​�ែ​ធ្វើ​ឲ្យ​បញ្ជី​កញ្ចប់​ទាន់សម�យ ឬ រ�់​ការ​ដំឡើង រួច​ហើយ ។"
 
@@ -4164,38 +4157,38 @@ msgstr "គ្មាន​កញ្ចប់​�ូច ។"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "មិន​អាច​ជំនួស %s ដោយ​ឯកសារ​កំណ�់​រចនាសម្ព�ន្ធ​�្មី​បាន​ឡើយ"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "កំពុង​ទាញ​យក​កញ្ចប់​"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "គ្មាន​កញ្ចប់​�ូច ។"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "គ្មាន​កញ្ចប់​�ូច ។"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "ដោះស្រាយ​ភាពអាស្រ�យ​"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "មិន​មាន​កញ្ចប់​�ូច​ឡើយ ។"
 msgstr[1] "មិន​មាន​កញ្ចប់​�ូច​ឡើយ ។"
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "ផ្លាស់ប្ដូរ %s ដង"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "ផ្លាស់ប្ដូរ %s ដង"
@@ -4203,7 +4196,7 @@ msgstr "ផ្លាស់ប្ដូរ %s ដង"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4213,64 +4206,64 @@ msgstr[1] "%d ដំឡើង"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "បរាជ�យ​ក្នុង​ការ​យក %s ច�ញ"
 msgstr[1] "បរាជ�យ​ក្នុង​ការ​យក %s ច�ញ"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "ទំហំទាញយក"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "ពុំ​បាន​ដំឡើង​"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "បាន​ដំឡើង"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "លុប​បំបា�់"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "រក្សា"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "រង់ចាំ"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "របៀបប្រើ"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4308,7 +4301,7 @@ msgstr "ទ�"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4353,17 +4346,17 @@ msgstr "%s; នឹង​áž�្រូវបាន​ដំឡើង​ដោយâ€
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "ស្វែងរក"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "ទិដ្ឋភាព​បង្កើ�"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "ទិដ្ឋភាព​បង្កើ�"
@@ -5055,113 +5048,114 @@ msgstr "មិន​ស្គាល់​ប្រភ�ទ​ការ​�ម
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "គោល​ការណ�​�ម្រៀប​�ាម​ឈ្មោះ មិន​មាន​អាគុយម៉ង់​ឡើយ"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "ឈ្មោះ​គោលការណ�​�ម្រៀប​មិន​�្រឹម�្រូវ"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "មិន​ផ្គូផ្គង '(' នៅ​ក្នុង​ស�ចក្ដីពណ៌នា​គោលការណ�​�ម្រៀប"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "គោលការណ�​�ម្រៀប​ប្រភ�ទ '%s' មិន​�្រឹម�្រូវ​ឡើយ"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "មិន​អាច​ឌិកូដ​�្សែអក្សរ​ច្រើន​បៃ ដែល​នៅ​បន្ទាប់ \"%ls\" បាន​ឡើយ"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "មិន​អាច​ឌិកូដ​�្សែអក្សរ​�ួអក្សរ​វែង ដែល​នៅ​បន្ទាប់ \"%s\" បាន​ឡើយ"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s បាន​ចងក្រង​នៅ​�្រង់ %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "កម្មវិធី​ចងក្រង ៖ g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 #, fuzzy
 msgid "Compiled against:\n"
 msgstr "កម្មវិធី​ចងក្រង ៖ g++ %s\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, fuzzy, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "រក្សា %F �្រឹម​កំណែ %s (%s)"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, fuzzy, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 "\n"
 "NCurses កំណែ ៖ %s\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, fuzzy, c-format
 msgid "  NCurses version %s\n"
 msgstr ""
 "\n"
 "NCurses កំណែ ៖ %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, fuzzy, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "libsigc++ កំណែ ៖ %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "រក្សា %F �្រឹម​កំណែ %s (%s)"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "រក្សា %F �្រឹម​កំណែ %s (%s)"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s បាន​ចងក្រង​នៅ​�្រង់ %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:181
 #, fuzzy
 msgid ""
 "\n"
@@ -5170,36 +5164,36 @@ msgstr ""
 "\n"
 "Curses កំណែ ៖ %s\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, fuzzy, c-format
 msgid "  NCurses version: %s\n"
 msgstr ""
 "\n"
 "NCurses កំណែ ៖ %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, fuzzy, c-format
 msgid "  cwidget version: %s\n"
 msgstr "libsigc++ កំណែ ៖ %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, fuzzy, c-format
 msgid "  Apt version: %s\n"
 msgstr ""
 "\n"
 "Curses កំណែ ៖ %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "របៀបប្រើប្រាស់ ៖ aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [ជម្រើស] <សកម្មភាព> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5208,42 +5202,42 @@ msgstr ""
 "  សកម្មភាព (បើ​មិន​បាន​បញ្ជាក់​ទ� aptitude នឹង​ចូល​ទៅ​ក្នុង​របៀប​អន្�រកម្ម) ៖\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, fuzzy, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - ដំឡើង ឬ ធ្វើ​ឲ្យ​កញ្ចប់​ទាន់សម�យ\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, fuzzy, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - យក​កញ្ចប់​ច�ញ\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, fuzzy, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - យក​កញ្ចប់ និង ឯកសារ​កំណ�់​រចនាសម្ព�ន្ធ​របស់​ពួក​វា​ច�ញ\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, fuzzy, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - ដាក់​កញ្ចប់​នៅ​ក្នុង​ស្�ានភាព​រង់ចាំ\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, fuzzy, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - បោះបង់​ពាក្យបញ្ជា hold សម្រាប់​កញ្ចប់​មួយ\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, fuzzy, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - សម្គាល់​កញ្ចប់​�ា​�្រូវ​បាន​ដំឡើង​ដោយ​ស្វ�យប្រវ�្�ិ\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, fuzzy, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - សម្គាល់​កញ្ចប់​�ា​�្រូវ​បាន​ដំឡើង​ដោយ​ដៃ\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5251,76 +5245,76 @@ msgid ""
 msgstr ""
 " forbid-version - ហាម​មិន​ឲ្យ aptitude ធ្វើ​ឲ្យ​ប្រសើរ​ទៅ​កាន់​កំណែ​កញ្ចប់​ជាក់លាក់​ណា​មួយ ។\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, fuzzy, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - ទាញយក​បញ្ជី​កញ្ចប់​�្មី/អាច​ធ្វើ​ឲ្យ​ទាន់សម�យ​បាន\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, fuzzy, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " upgrade      - អនុវ�្�​ការ​ធ្វើ​ឲ្យ​ប្រសើរ​ដ�​មាន​សុវ�្�ិភាព\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, fuzzy, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
 msgstr " dist-upgrade - អនុវ�្�​ការ​ធ្វើ​ឲ្យ​ប្រសើរ ។ ប្រហែល​ជា​�្រូវ​ដំឡើង ឬ យក​កញ្ចប់​�្លះ​ច�ញ ។\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, fuzzy, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - បំភ្ល�ច​កញ្ចប់​ដែល \"�្មី\"\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, fuzzy, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - ស្វែងរក​កញ្ចប់​មួយ​�ាម​រយៈ​ឈ្មោះ និង/ឬ កន្សោម\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, fuzzy, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - បង្ហាញ​ព��៌មាន​លម្អិ�​អំពី​កញ្ចប់​មួយ\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - បង្ហាញ​ព��៌មាន​លម្អិ�​អំពី​កញ្ចប់​មួយ\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, fuzzy, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - លុប​ឯកសារ​កញ្ចប់​ដែល​បាន​ទាញយក\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, fuzzy, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - លុប​ឯកសារ​កញ្ចប់​ចាស់ៗ​ដែល​បាន​ទាញយក\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, fuzzy, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - មើល​កំណ�់ហ��ុ​ការ​ផ្លាស់ប្ដូរ​របស់​កញ្ចប់​មួយ\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, fuzzy, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - ទាញយក​ឯកសារ .deb របស់​កញ្ចប់​មួយ\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, fuzzy, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
 msgstr " reinstall    - ទាញយក និង (បើ​អាច) ដំឡើង​ឡើងវិញ​នូវ​កញ្ចប់​ដែល​បាន​ដំឡើង​បច្ចុប្បន្ន\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, fuzzy, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5328,7 +5322,7 @@ msgid ""
 "                why one or more packages would require the given package.\n"
 msgstr " -Z\t\t    បង្ហាញ​ការ​ផ្លាស់ប្ដូរ​នៅ​ក្នុង​ទំហំ​ដែល​បាន​ដំឡើង របស់​កញ្ចប់​នីមួយៗ ។\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, fuzzy, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5337,127 +5331,127 @@ msgid ""
 "                lead to a conflict with the given package if installed.\n"
 msgstr " -Z\t\t    បង្ហាញ​ការ​ផ្លាស់ប្ដូរ​នៅ​ក្នុង​ទំហំ​ដែល​បាន​ដំឡើង របស់​កញ្ចប់​នីមួយៗ ។\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  ជម្រើស ៖\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, fuzzy, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             អ�្�បទ​ជំនួយ​ន�ះ\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             អ�្�បទ​ជំនួយ​ន�ះ\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             ក្លែង​ធ្វើ​សកម្មភាព​ណា​មួយ ប៉ុន្�ែ​មិន​អនុវ�្�​ពិ�​ឡើយ\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr " -d             គ្រាន់​�ែ​ទាញយក​កញ្ចប់​ប៉ុណ្ណោះ ដោយ​មិន​ដំឡើង ឬ យក​អ្វី​ច�ញ​ទាំងអស់ ។\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, fuzzy, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             សាកសួរ​ជានិច្ច មុន​នឹង​ធ្វើ​អ្វី​មួយ\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, fuzzy, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             សន្ម�​�ា​ចម្លើយ​របស់​សំណួរ បាទ/ចាស ឬ ទ� ធម្ម�ាៗ​គឺ​ជា 'បាទ/ចាស'\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, fuzzy, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
 msgstr " -F ទ្រង់ទ្រាយ      បញ្ជាក់​ទ្រង់ទ្រាយ​មួយ ដើម្បី​បង្ហាញ​លទ្ធផល​ស្វែងរក ។ សូម​មើល​សៀវភៅ​ដៃ\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, fuzzy, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
 msgstr " -O លំដាប់       បញ្ជាក់​របៀប​�ម្រៀប​លទ្ធផល​ស្វែងរក ។ សូម​មើល​សៀវភៅ​ដៃ\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, fuzzy, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w ទទឹង       បញ្ជាក់ទទឹងដើម្បី​ធ្វើ​ទ្រង់ទ្រាយ​លទ្ធផល​ស្វែងរក\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             �ំ​ព្យាយាម​ជួសជុល​កញ្ចប់​ដែល​�ូច ។\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             បង្ហាញ​កំណែ​នៃ​កញ្ចប់ ដែល​នឹង​�្រូវ​ដំឡើង ។\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             បង្ហាញ​ភាព​អាស្រ�យ​នៃ​កញ្ចប់​ដែល​បាន​ផ្លាស់ប្ដូរ​ដោយ​ស្វ�យប្រវ�្�ិ ។\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    បង្ហាញ​ការ​ផ្លាស់ប្ដូរ​នៅ​ក្នុង​ទំហំ​ដែល​បាន​ដំឡើង របស់​កញ្ចប់​នីមួយៗ ។\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, fuzzy, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
 msgstr " -v             បង្ហាញ​ព��៌មាន​បន្�ែម​ទៀ� ។ (ប្រហែល​ជា​ផ្ដល់​ច្រើន​ដង)\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, fuzzy, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [ការច�ញផ្សាយ]   កំណ�់​ការ​ច�ញផ្សាយ ដែល​គួរ​ដំឡើង​កញ្ចប់​ពី\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, fuzzy, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr " -q             នៅ​ក្នុង​របៀប​បន្ទា�់​ពាក្យបញ្ជា ទប់ស្កា�់​ទ្រនិច​បង្ហាញ​វឌ្�នភាព ។\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, fuzzy, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o កូនសោ=�ម្លៃ     កំណ�់​ដោយ​ផ្ទាល់​នូវ​ជម្រើស​ការ​កំណ�់​រចនាសម្ព�ន្ធ ដែល​មាន​ឈ្មោះ 'កូនសោ'\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, fuzzy, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5466,159 +5460,139 @@ msgstr ""
 " --with(out)-recommends\tបញ្ជាក់​�ា​�ើ​�្រូវ​ចា�់​ទុក​ការ​ផ្ដល់​អនុសាសន�​ជា\n"
 "                ភាព​អាស្រ�យ​�្លាំងក្លា​ឬ​ទ�\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S ឈ្មោះឯកសារ ៖ អានព��៌មាន​ស្�ានភាព​បន្�ែម​ទៀ�​របស់ aptitude ពី ឈ្មោះ​ឯកសារ ។\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u      ៖ ទាញយក​បញ្ជី​កញ្ចប់​�្មី​នៅ​ព�ល​ចាប់​ផ្ដើម ។\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             អ�្�បទ​ជំនួយ​ន�ះ\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i       ៖ រ�់​ការ​ដំឡើង​មួយ នៅ​ព�ល​ចាប់ផ្ដើម ។\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  aptitude ន�ះ​មិន​មាន Super Cow Powers ​ទ�​ ។\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 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:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 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:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 msgid "error"
 msgstr "Err "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 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:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "ប្រ�ិប�្�ិការ %s មិន​�្រឹម�្រូវ"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "បាន​រំពឹង​�ម្លៃ​ល�� នៅ​បន្ទាប់​ពី -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "បាន​រំពឹង​�ម្លៃ​ល�� នៅ​បន្ទាប់​ពី -q=, ប៉ុន្�ែ​បែរ​ជា​ជួប %s ទៅ​វិញ\n"
-
-#: src/main.cc:798
-#, fuzzy, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o ទាមទារ​អាគុយម៉ង់​មួយ ដែល​មាន​ទម្រង់​ជា កូនសោ=�ម្លៃ, �ែ​បែរ​ជា​ទទួល​បាន %s ទៅ​វិញ"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "ចម្លែក​មែនទែន ៖ បាន​ទទួល​កូដ​ជម្រើស​ដែល​មិន​ស្គាល់\n"
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "កញ្ចប់​"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "កញ្ចប់​ទាំង​អស់"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5626,36 +5600,31 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "អាច​បញ្ជាក់​�ែ​មួយ​ប៉ុណ្ណោះ​ក្នុង​ចំណោម -u និង -i\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr "មិន​គួរ​បញ្ជាក់ -u និង -i នៅ​ក្នុងរបៀប​បន្ទា�់​ពាក្យបញ្ជា​ឡើយ (ឧ. ជាមួយ 'install')"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "មិន​គួរ​បញ្ជាក់ -u និង -i ជាមួយ​ពាក្យបញ្ជា​ឡើយ"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "មិន​ស្គាល់​ពាក្យ​បញ្ជា \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "មិន​ស្គាល់​ពាក្យ​បញ្ជា \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "ករណីលើកលែង​ដែល​មិន​បាន​ចាប់ ៖ %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, fuzzy, c-format
 msgid ""
 "Backtrace:\n"
@@ -5673,7 +5642,7 @@ msgstr "ស្វែងរក ៖ "
 msgid "Search backwards for: "
 msgstr "ស្វែងរក​�យក្រោយ ៖ "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "អ្នក​ដោះ​មីន"
 
@@ -5882,7 +5851,7 @@ msgstr "សំណុំ�ួអក្សរ​របស់ mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "កញ្ចប់​"
 
@@ -5963,8 +5932,8 @@ msgstr "<មិនមាន>"
 msgid "<none>"
 msgstr "<គ្មាន>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "និម្មិ�​"
@@ -6098,7 +6067,7 @@ msgstr "មិន​អាច​បម្លែង​ទ្រង់ទ្រា
 msgid "Internal error: Default column string is unparsable"
 msgstr "កំហុស​�ាង​ក្នុង ៖ �្សែអក្សរ​ជួរឈរ​លំនាំដើម គឺ​មិន​អាច​ញែក​បាន​ឡើយ"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "ភារកិច្ច​"
 
@@ -6251,21 +6220,17 @@ msgstr "សន្ទស្សន�​ផ្គូផ្គង​�្រូវ
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "សន្ទស្សន�​ផ្គូផ្គង %ls ធំព�ក​ហើយ ។ មាន​ក្រុម​ដូចជា (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "កញ្ចប់​គ្មាន​ស្លាក"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "ស្លាក​ដែល​បា�់"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "កញ្ចប់​ប្រភព ៖ "
@@ -6861,7 +6826,7 @@ msgstr "កំពុង​ផ្ទុកឃ្លាំងសម្ងា�់
 msgid "Really quit Aptitude?"
 msgstr "ពិ�​ជា​ច�ញ​ពី Aptitude ?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -6942,7 +6907,7 @@ msgstr ""
 msgid "License"
 msgstr "អាជ្ញាបណ្ណ"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 #, fuzzy
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "មើល​កិច្ចព្រមព្រៀង មុន​នឹង​ចម្លង​កម្មវិធី"
@@ -6964,7 +6929,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "ជំនួយ"
 
@@ -6994,7 +6959,7 @@ msgstr "ដោយ​ដៃ"
 msgid "FAQ"
 msgstr "សំណួរ​ដែល​សួរ​រឿយៗ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "មើល​បញ្ជី​នៃ​សំណួរ​ដែល​សួរ​រឿយៗ"
 
@@ -7033,15 +6998,15 @@ msgstr ""
 "ប្រយោជន�​ឡើយ ហើយ​អ្នក​អាច​លុប​វា​បាន ។ %n%n�ើ​អ្នក​ចង់​លុប​��​ន�ះ និង មា�ិកា​ទាំងអស់​របស់​វា​ឬ​ទ� ? បើ​អ្នក​"
 "ជ្រើស \"ទ�\", អ្នក​នឹង​មិន​ឃើញ​សារ​ន�ះ​ទៀ�​ឡើយ ។"
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "មើល​វឌ្�នភាព​នៃ​ការ​ទាញយក​កញ្ចប់"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "ទាញយក​កញ្ចប់"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7052,42 +7017,42 @@ msgstr ""
 "អាច​នឹង %Bcompromise ផ្នែក​សុវ�្�ិភាព %b នៃ​ប្រព�ន្ធ​របស់​អ្នក ។ អ្នក​គួរ​បន្�​ការ​ដំឡើង �ែ​ក្នុង​ករណី​ដែល​"
 "អ្នក​ដឹង​ច្បាស់​�ា​អ្នក​នឹង​ធ្វើ​អ្វី​ប៉ុណ្ណោះ ។%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [កំណែ %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "ពិ�​ជាបន្�​"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "បោះបង់ការ​ដំឡើង"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "ទិដ្ឋភាព​របស់​ការ​ដំឡើង​កញ្ចប់"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "មើល និង/ឬ លៃ�ម្រូវ​សកម្មភាព ដែល​នឹង​�្រូវ​អនុវ�្�"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "កញ្ចប់​�្លះ​បាន�ូច ហើយ​ក�បាន​ជួសជុល​ផងដែរ​ ៖"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "គ្មាន​ដំណោះ​ស្រាយ​ទៅ​នឹង​បញ្ហា​ភាព​អាស្រ�យ​​ដែល​មាន​​ទាំង​ន�ះ !"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "អស់​ព�លវ�លា​រ�់ �ណៈព�ល​ព្យាយាម​ដោះស្រាយ​ភាព​អស្រ�យ​ (ចុច \"%s\" ឬ ព្យាយាម​បន្�​ទៀ�)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7095,19 +7060,19 @@ msgstr ""
 "ការ​ដំឡើង និង ការ​យក​កញ្ចប់​ច�ញ �្រូវការ​សិទ្ធិ​ជា​អ្នក​គ្រប់គ្រង ដែល​បច្ចុប្បន្ន​អ្នក​មិន​មាន ។ �ើ​អ្នក​ចង់​ប្ដូរ​"
 "ទៅ​គណនី root ឬ​ទ� ?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "ក្លាយជា​ root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "កុំ​ក្លាយ​ជា​ root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "មិន​បាន​កំណ�់​កញ្ចប់​ឲ្យ​ដំឡើង យកច�ញ ឬ ធ្វើ​ឲ្យ​ទាន់សម�យ​ឡើយ ។"
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7116,19 +7081,19 @@ msgstr ""
 "មិន​មាន​កញ្ចប់​�្រូវ​បាន​ដំឡើង យកច�ញ ឬ ធ្វើ​ឲ្យ​ទាន់សម�យ​ឡើយ ។ កញ្ចប់​មួយ​ចំនួន​អាច​នឹង​�្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ "
 "ប៉ុន្�ែ​អ្នក​មិន​បាន​ជ្រើស​�ា​�្រូវ​ធ្វើ​ឲ្យ​ពួកវា​ប្រសើរ​ឡើយ ។ វាយ \"U\" ដើម្បី​រៀបចំ​ការ​ធ្វើ​ឲ្យ​ប្រសើរ ។"
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "ធ្វើ​ឲ្យ​បញ្ជី​កញ្ចប់​ទាន់​សម�យ"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "មើល​វឌ្�នភាព​របស់​ការ​ធ្វើ​ឲ្យ​បញ្ជី​កញ្ចប់​ទាន់សម�យ"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "ធ្វើ​ឲ្យ​បញ្ជី​ទាន់សម�យ"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7136,23 +7101,23 @@ msgstr ""
 "ការ​ធ្វើ​ឲ្យ​បញ្ជី​កញ្ចប់​ទាន់សម�យ �្រូវការ​សិទ្ធិ​ជា​អ្នក​គ្រប់គ្រង ដែល​បច្ចុប្បន្ន​អ្នក​មិន​មាន ។ �ើ​អ្នក​ចង់​ប្ដូរ​ទៅ​"
 "គណនី root ឬ​ទ� ?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "ចំណាយព�ល​រាវ​មីន"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "មិន​អនុញ្ញា�​ឲ្យ​សម្អា�​ឡើយ �ណៈព�ល​កំពុង​�ែ​ទាញយក"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "កំពុង​លុបឯកសារ​ដែល​បានទាញ​យក​"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "បាន​លុប​ឯកសារ​កញ្ចប់ ដែល​បាន​ទាញយក"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7161,18 +7126,18 @@ msgstr ""
 "ការ​ធ្វើ​ឲ្យ​បញ្ជី​កញ្ចប់​ទាន់សម�យ �្រូវការ​សិទ្ធិ​ជា​អ្នក​គ្រប់គ្រង ដែល​បច្ចុប្បន្ន​អ្នក​មិន​មាន ។ �ើ​អ្នក​ចង់​ប្ដូរ​ទៅ​"
 "គណនី root ឬ​ទ� ?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "មិន​មាន​ឯកសារ​ឃ្លាំងសម្ងា�់ apt ឡើយ ដូច្ន�ះ​មិន​អាច​សម្អា�​ដោយ​ស្វ�យប្រវ�្�ិ​បាន​ឡើយ ។"
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "បាន​លុប​ឯកសារ​កញ្ចប់​ដែល​បាន​ទាញយក ហើយ​លែងប្រើ ។ �ាស​ទំហំ %sបៃ កំពុង​�ែ​ធ្វើ​ឲ្យ​ទំន�រ ។"
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7181,131 +7146,131 @@ msgstr ""
 "ការ​ធ្វើ​ឲ្យ​បញ្ជី​កញ្ចប់​ទាន់សម�យ �្រូវការ​សិទ្ធិ​ជា​អ្នក​គ្រប់គ្រង ដែល​បច្ចុប្បន្ន​អ្នក​មិន​មាន ។ �ើ​អ្នក​ចង់​ប្ដូរ​ទៅ​"
 "គណនី root ឬ​ទ� ?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "មិន​មាន​ដំណោះស្រាយ​ផ្ស�ង​ឡើយ ។"
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "មិន​អាច​រក​ដំណោះស្រាយ​ដើម្បី​អនុវ�្�​បាន​ឡើយ ។"
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "អស់​ព�ល​ �ណៈ​ព�ល​ព្យាយាម​រក​ដំណោះស្រាយ ។"
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "ដោះស្រាយ​ភាពអាស្រ�យ​"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "ស្វែងរក​ដំណោះស្រាយ​​សម្រាប់​ភាពអាស្រ�យ ដែល​មិន​បាន​ដោះស្រាយ"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "មិន​អាច​បើក​ %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "មាន​កំហុស �ណៈព�ល​បោះចោល​ស្�ានភាព​របស់​កម្មវិធី​ដោះស្រាយ"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "ដំឡើង​/យក​កញ្ចប់​ច�ញ​"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "ធ្វើ​ឲ្យ​បញ្ជី​កញ្ចប់​ទាន់សម�យ"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "សម្គាល់​កញ្ចប់​ដែល​អាច​ធ្វើ​ឲ្យ​ប្រសើរ"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "បំភ្ល�ច​កញ្ចប់​�្មី"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "បោះបង់​សកម្មភាព​ដែល​មិន​ទាន់​សម្រ�ច"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "សម្អា�​ឃ្លាំងសម្ងា�់​កញ្ចប់"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "សម្អា�​ឯកសារ​ដែល​លែងប្រើ"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "ផ្ទុក​ឃ្លាំងសម្ងា�់​កញ្ចប់​ឡើង​វិញ"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "ល�ង​ល្បែង​ដោះមីន"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "ក្លាយ​ជា​ root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "ច�ញ"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "មិន​ធ្វើ​វិញ"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "ដំឡើង"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "បោះទង់​សម្គាល់​កញ្ចប់​ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន ដើម្បី​ដំឡើង ឬ ធ្វើ​ឲ្យ​ប្រសើរ"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "យក​ច�ញ"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "បោះទង់​សម្គាល់​កញ្ចប់​ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន ដើម្បី​យកច�ញ"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "លុប​បំបា�់"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "បោះទង់​សម្គាល់​កញ្ចប់ ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន និង ឯកសារ​កំណ�់​រចនាសម្ព�ន្ធ​របស់​វា ដើម្បី​យកច�ញ"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "រក្សា"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "បោះបង់​ចោល​សកម្មភាព​ចំពោះ​កញ្ចប់​ដែល​បាន​ជ្រើស"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "រង់ចាំ"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "បោះបង់​សកម្មភាព​នានា​ចំពោះ​កញ្ចប់​ដែល​បាន​ជ្រើស ហើយ​ការពារ​វា​កុំ​ឲ្យ​មាន​ការ​ធ្វើ​ឲ្យ​ប្រសើរ"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "សម្គាល់​ស្វ�យប្រវ�្�ិ"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7313,11 +7278,11 @@ msgstr ""
 "សម្គាល់​កញ្ចប់​ដែល​បាន​ជ្រើស �ា​�្រូវ​បាន​ដំឡើង​ដោយ​ស្វ�យប្រវ�្�ិ ។ វា​នឹង​�្រូវ​បាន​យកច�ញ​ដោយ​ស្វ�យប្រវ�្�ិ បើ​មិន​"
 "មាន​កញ្ចប់​ណា​មួយ​អាស្រ�យ​�ាម​វា"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "សម្គាល់​ដោយ​ដៃ"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7325,11 +7290,11 @@ msgstr ""
 "សម្គាល់​កញ្ចប់​ដែល​បាន​ជ្រើស �ា​�្រូវ​បាន​ដំឡើង​ដោយ​ដៃ ។ វា​នឹង​មិន​�្រូវ​បាន​យកច�ញ​ឡើយ ទាល់​�ែ​អ្នក​យកវា​ច�ញ​"
 "ដោយ​ដៃ"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "ហាមឃា�់​កំណែ"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7337,336 +7302,336 @@ msgstr ""
 "ហាមឃា�់​កំណែ​សាកល្បង​របស់​កញ្ចប់​ដែល​បាន​ជ្រើស �ា​កុំ​ឲ្យ​ដំឡើង ។ កំណែ​�្មី​ជាង​របស់​កញ្ចប់ នឹង​�្រូវ​បាន​ដំឡើង​"
 "ធម្ម�ា"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "ព��៌មាន​"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "បង្ហាញ​ព��៌មាន​បន្�ែម​អំពី​កញ្ចប់​ដែល​បាន​ជ្រើ​ស"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "កំណ�់​ហ��ុ​ការ​ផ្លាស់ប្ដូរ"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "បង្ហាញ​កំណ�់ហ��ុ​ការ​ផ្លាស់ប្ដូរ​របស់​ដ�បៀន នៃ​កញ្ចប់​ដែល​បាន​ជ្រើស"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "ពិនិ�្យ​ដំណោះស្រាយ​"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "ពិនិ�្យ​ដំណោះស្រាយ​ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន របស់​បញ្ហា​ដែល​ទាក់ទង​នឹង​ភាព​អាស្រ�យ ។"
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "អនុវ�្�ដំណោះស្រាយ​"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "អនុវ�្�​សកម្មភាព​ដែល​មាន​នៅ​ក្នុង​ដំណោះស្រាយ ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន ។"
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "ដំណោះស្រាយ​បន្ទាប់​"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "ជ្រើស​ដំណោះស្រាយ​បន្ទាប់ ដើម្បី​ដោះស្រាយ​បញ្ហា​ភាព​អាស្រ�យ ។"
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "ដំណោះស្រាយ​មុន​"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "ជ្រើស​ដំណោះស្រាយ​មុន ដើម្បី​ដោះស្រាយ​បញ្ហា​ភាព​អាស្រ�យ ។"
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "ដំណោះស្រាយ​ដំបូង​"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "ជ្រើស​ដំណោះស្រាយ​ដំបូង ដើម្បី​ដោះស្រាយ​បញ្ហា​ភាព​អាស្រ�យ ។"
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "ដំណោះស្រាយ​ចុង​ក្រោយ"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "ជ្រើស​ដំណោះស្រាយ​ចុងក្រោយ ដើម្បី​ដោះស្រាយ​បញ្ហា​ភាព​អាស្រ�យ ។"
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "បិទបើក ការ​ច្រានចោល"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "បិទបើក �ា​�ើ​សកម្មភាព​ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន �្រូវ​បាន​ច្រានចោល​ឬ​ក�​អ�់ ។"
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "បិទបើក ការ​យល់ស្រប"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "បិទបើក �ា​�ើ​សកម្មភាព​ដែល​បាន​ជ្រើស​បច្ចុប្បន្ន​�្រូវ​បាន​យល់ស្រប​ឬ​ក�​អ�់ ។"
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "មើល​គោល​ដៅ​"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "មើល​កញ្ចប់​ដែល​នឹង​�្រូវ​ប៉ះពាល់​ដោយ​សកម្មភាព​ដែល​បាន​ជ្រើស"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "រក​"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "ស្វែងរក​ទៅ​មុ�"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "រក​�យ​ក្រោយ​"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "ស្វែង​រក​�យ​ក្រោយ"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "រកម្�ង​ទៀ�​"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "ធ្វើការ​ស្វែងរក​ចុងក្រោយ​ម្ដង​ទៀ�"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 #, fuzzy
 msgid "Find Again ^Backwards"
 msgstr "រក​�យ​ក្រោយ​"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 #, fuzzy
 msgid "Repeat the last search in the opposite direction"
 msgstr "ធ្វើការ​ស្វែងរក​ចុងក្រោយ​ម្ដង​ទៀ�"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "កំណ�់​ការ​បង្ហាញ"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "អនុវ�្�​�ម្រង​ទៅ​កាន់​បញ្ជី​កញ្ចប់"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "មិន​កំណ�់​ការ​បង្ហាញ"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "យក​�ម្រង​ច�ញពី​បញ្ជី​កញ្ចប់​"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "រក​កញ្ចប់​ដែល​�ូច"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "រក​កញ្ចប់​បន្ទាប់ ដែល​មាន​ភាពអាស្រ�យ​មិន​ទាន់​បាន​ដោះស្រាយ"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 #, fuzzy
 msgid "^Preferences"
 msgstr "ផ្អែកលើ​ជា​ស្រ�ច"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "ជម្រើស​ចំណុចប្រទាក់"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "ផ្លាស់ប្ដូរ​ការ​កំណ�់ ដែល​ប៉ះពាល់​ដល់​ចំណុចប្រទាក់​អ្នកប្រើ"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "ការ​ដោះស្រាយ​ភាព​អាស្រ�យ"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "ផ្លាស់ប្ដូរ​ការ​កំណ�់​ដែល​ប៉ះពាល់​របៀប​ដោះស្រាយ​ភាព​អាស្រ�យ​របស់​កញ្ចប់"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "ផ្ស�ងៗ"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "ផ្លាស់ប្ដូរ​ការ​កំណ�់​ផ្ស�ងៗ​របស់​កម្មវិធី"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "បញ្ច្រាស​ជម្រើស"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "កំណ�់​ការ​កំណ�់​ទាំងអស់​ទៅ​ជា​លំនាំដើម​វិញ"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "បន្ទាប់​"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "មើល​ការ​បង្ហាញ​បន្ទាប់"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "មុន​"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "មើល​ការ​បង្ហាញ​មុន"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "បិទ​"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "បិទ​ការ​បង្ហាញ​ន�ះ"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "ទិដ្ឋភាព​កញ្ចប់​�្មី"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "បង្កើ�​ទិដ្ឋភាព​កញ្ចប់​លំនាំដើម​�្មី"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "ពិនិ�្យ​ការ​ផ្ដល់​អនុសាសន�"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr "មើល​កញ្ចប់​ដែល​�្រូវ​បាន​ផ្ដល់​អនុសាសន�​ឲ្យ​ដំឡើង �ែ​មិន​ទាន់​បាន​ដំឡើង ។"
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "បញ្ជី​កញ្ចប់​ធម្ម�ា"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "មើល​កញ្ចប់​ទាំងអស់​នៅ​ក្នុង​ប្រព�ន្ធ នៅ​ក្នុង​បញ្ជី​�ែមួយ"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "កម្មវិធី​រុករក ^Debtags �្មី"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "រកមើល​កញ្ចប់​ដោយ​ប្រើ​ទិន្នន�យ Debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "កម្មវិធី​រុករក​�ាមប្រភ�ទ �្មី"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "រកមើល​កញ្ចប់​�ាម​ប្រភ�ទ"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "អំពី"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "មើល​ព��៌មាន​អំពី​កម្មវិធី​ន�ះ​"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "ជំនួយ​"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "មើល​ជំនួយ"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "របៀបប្រើ"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "មើល​របៀបប្រើ​កម្មវិធី​នីមួយៗ"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "សំណួរ​ដែល​សួរ​រឿយៗ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "ព��៌មាន​"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "មើល​ការ​ផ្លាស់ប្ដូរ​សំ�ាន់ៗ ដែល​បាន​ធ្វើ​នៅ​ក្នុង​កំណែ​នីមួយៗ​របស់ "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "អាជ្ញាបណ្ណ"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "សកម្មភាព​"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "ស្វែងរក"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "ជម្រើស​"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "មើល​"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7675,11 +7640,11 @@ msgstr ""
 "%ls ៖ ម៉ឺនុយ  %ls ៖ ជំនួយ  %ls ៖ ច�ញ  %ls ៖ ធ្វើ​អោយ​ប្រសើរ  %ls ៖ ទាញយក​/​ដំឡើង​/​យក​ច�ញ "
 "Pkgs"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -7707,9 +7672,41 @@ msgstr "URL ដែលáž�្រូវប្រើ​​ដើម្បី​ទáž
 msgid "Downloading the changelog of %s"
 msgstr "​​ទាញយក​កំណ�់​ហ��ុ​ផ្លាស់ប្ដូរ"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "អ្នក​អាច​មើល​�ែ​កំណ�់ហ��ុ​ការ​ផ្លាស់ប្ដូរ របស់​កញ្ចប់​ដ�បៀន​ផ្លូវការ​ប៉ុណ្ណោះ ។"
+#~ msgid "MISSING TAG"
+#~ msgstr "ស្លាក​ដែល​បា�់"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL ដែល�្រូវប្រើ​​ដើម្បី​ទាញ​យក​កំណ�់​ហ��ុ​ការ​ផ្លាស់ប្ដូរ"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s ​មិន​មែន​ជាកញ្ចប់​ដ�បៀន​ផ្លូវការ​ឡើយ ដូច្ន�ះ​មិន​អាច​បង្ហាញ​កំណ�់ហ��ុ​ការ​ផ្លាស់ប្ដូរ​របស់​វា​បាន​ឡើយ ។"
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "មិន​អាច​រក​កញ្ចប់​​​មួយ​ដែល​​មាន​ឈ្មោះ \"%s\" ឡើយ"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "មិន​អាច​ញែក​លំនាំ %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "បាន​រំពឹង​�ម្លៃ​ល�� នៅ​បន្ទាប់​ពី -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "បាន​រំពឹង​�ម្លៃ​ល�� នៅ​បន្ទាប់​ពី -q=, ប៉ុន្�ែ​បែរ​ជា​ជួប %s ទៅ​វិញ\n"
+
+#, fuzzy
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o ទាមទារ​អាគុយម៉ង់​មួយ ដែល​មាន​ទម្រង់​ជា កូនសោ=�ម្លៃ, �ែ​បែរ​ជា​ទទួល​បាន %s ទៅ​វិញ"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "ចម្លែក​មែនទែន ៖ បាន​ទទួល​កូដ​ជម្រើស​ដែល​មិន​ស្គាល់\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "មិន​គួរ​បញ្ជាក់ -u និង -i ជាមួយ​ពាក្យបញ្ជា​ឡើយ"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "អ្នក​អាច​មើល​�ែ​កំណ�់ហ��ុ​ការ​ផ្លាស់ប្ដូរ របស់​កញ្ចប់​ដ�បៀន​ផ្លូវការ​ប៉ុណ្ណោះ ។"
 
 #~ msgid "Err "
 #~ msgstr "Err "
@@ -7839,11 +7836,6 @@ msgstr "អ្នក​អាច​មើល​�ែ​កំណ�់ហ��
 #~ msgstr "​​ទាញយក​កំណ�់​ហ��ុ​ផ្លាស់ប្ដូរ"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "រក​មិន​ឃើញ​គុណភាព​បង្ហាញ ។"
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "មិន​អាច​បើក​ឯកសារ​ឋានានុក្រម​កញ្ចប់ %s បាន​ឡើយ"
diff --git a/po/ku.gmo b/po/ku.gmo
index 1478ec8f..bc94c25a 100644
--- a/po/ku.gmo
+++ b/po/ku.gmo
diff --git a/po/ku.po b/po/ku.po
index fbe70477..25990bd4 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-05-23 10:10+0800\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <ubuntu-l10n-kur@lists.ubuntu.com>\n"
@@ -304,66 +304,55 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr ""
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr ""
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -371,11 +360,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr ""
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -383,11 +372,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr ""
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -395,11 +384,11 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -407,11 +396,11 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr ""
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -422,11 +411,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr ""
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -437,22 +426,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -465,15 +454,15 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr ""
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr ""
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Curbecur"
 
@@ -577,117 +566,115 @@ msgstr ""
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already installed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already going to be installed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, 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:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr ""
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
 "      virtual package \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr ""
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, 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:560
+#: src/cmdline/cmdline_action.cc:555
 #, 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:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -701,7 +688,7 @@ msgid ""
 "packages contain \"%s\" in their description:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr ""
@@ -723,28 +710,22 @@ msgstr ""
 msgid "Changelog download failed: %s"
 msgstr "Betal"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr ""
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, c-format
 msgid "Couldn't run pager %s"
 msgstr ""
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
+msgid "The clean command takes no arguments"
 msgstr ""
 
 #: src/cmdline/cmdline_clean.cc:66
@@ -752,68 +733,59 @@ msgstr ""
 msgid "Del %s* %spartial/*\n"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Dev jê berde.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
+msgid "download: you must specify at least one package to download"
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr ""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -847,30 +819,21 @@ msgid "[Working]"
 msgstr "[Dixebite]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Pakêteke wusa tune \"%s\""
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
+msgid "The forget-new command takes no arguments"
 msgstr ""
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr ""
@@ -978,33 +941,33 @@ msgstr "Ev paket dê werin bilindkirin:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Ev paketên nîv-sazkirî dê werin mîhengkirin:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Ev paketên BINGEHÎ dê werin RAKIRIN!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Ev paketên BINGEHÎ bi vê çalakiyê dê werin ŞIKANDIN:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, 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:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1015,14 +978,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  %s::CmdLine::Ignore-Trust-Violations is 'true'!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1033,7 +996,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1042,199 +1005,199 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1242,45 +1205,45 @@ msgid ""
 "The following actions are available:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1288,53 +1251,53 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "Ev paketên NÛ dê werin sazkirin:"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Ferman:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Tu dixwazî bidomînî? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1345,7 +1308,7 @@ msgstr ""
 "Agahiya bindestiyê dê were nîşandayîn.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1356,7 +1319,7 @@ msgstr ""
 "Agahiya bindestiyê dê neyê nîşandayîn.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1367,7 +1330,7 @@ msgstr ""
 "Guherto dê were nîşandayîn.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1378,7 +1341,7 @@ msgstr ""
 "Guherto dê neyê nîşandayîn.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1386,7 +1349,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1506,6 +1469,11 @@ msgstr ""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr ""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Pakêteke wusa tune \"%s\""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1652,7 +1620,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1680,7 +1648,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr ""
 
@@ -1710,7 +1678,7 @@ msgid ""
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1719,23 +1687,22 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
+msgid "iconv of %s failed"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
 msgstr ""
 
 #: src/cmdline/cmdline_show_broken.cc:81
@@ -1779,7 +1746,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr ""
@@ -2002,7 +1969,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr ""
 
@@ -2016,15 +1983,9 @@ msgstr "Rave: "
 msgid "Homepage: "
 msgstr "Malper:"
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr ""
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr ""
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Pakêt nayên dîtin"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2035,13 +1996,12 @@ msgstr ""
 msgid "Internal Error, Ordering didn't finish"
 msgstr ""
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
+msgid "The update command takes no arguments"
 msgstr ""
 
 #: src/cmdline/cmdline_user_tag.cc:65
@@ -2059,132 +2019,153 @@ msgstr ""
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
-#, c-format
-msgid "No candidate version found for %s\n"
-msgstr ""
-
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No current or candidate version found for %s\n"
+msgid "No candidate version found for %s"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
+msgid "No current or candidate version found for %s"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:239
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:273
-#, c-format
-msgid "Couldn't find task '%s'"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "RewÅŸa niha: %F"
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:937
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't read list of package sources"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Xwendina lîsteyên çavkaniyên paketan serneket"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Pakêt"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Pakêta Çavkaniyê:"
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "Arşîv"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+msgid "versions: You must provide at least one package selector"
 msgstr ""
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2207,7 +2188,7 @@ msgstr ""
 msgid "Candidate"
 msgstr "Berendam"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Saz bike"
 
@@ -2309,20 +2290,18 @@ msgstr ""
 msgid "Packages requiring %s:"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 
 #: src/cmdline/cmdline_why.h:212
@@ -2349,11 +2328,11 @@ msgstr ""
 msgid "UNAVAILABLE"
 msgstr ""
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Etîket"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Etîketên Bikarhêner"
 
@@ -2549,31 +2528,31 @@ msgid ""
 "you make to the states of packages will NOT be preserved!"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2640,34 +2619,40 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2814,13 +2799,13 @@ msgid ""
 "Log complete.\n"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "Pakêtên şikestî tune."
@@ -2927,18 +2912,18 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, fuzzy, c-format
 msgid "Changelog of %s"
 msgstr "Betal"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "Tê daxistin "
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Tê daxistin "
@@ -2987,26 +2972,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Tê daxistin "
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr ""
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "Pakêtên şikestî tune"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "Pakêtên şikestî tune"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3150,43 +3136,43 @@ msgstr ""
 msgid "_File"
 msgstr "ÅžaÅŸ"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 msgid "Restart the program as root; your settings will be preserved"
 msgstr ""
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Ji bernameyê derkeve"
 
@@ -3194,7 +3180,7 @@ msgstr "Ji bernameyê derkeve"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
@@ -3228,7 +3214,7 @@ msgid "_Help"
 msgstr "Alîkarî"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3237,19 +3223,19 @@ msgstr ""
 msgid "Update"
 msgstr "Bilindkirin"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Pakêt"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Pêşdîtin"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Çareserî"
 
@@ -3427,7 +3413,7 @@ msgid "Fix Manually"
 msgstr ""
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Bilindkirin"
 
@@ -3946,11 +3932,11 @@ msgstr "Sazkirî"
 msgid "Reinstall"
 msgstr ""
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Nizmkirin"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Rake"
 
@@ -3984,7 +3970,7 @@ msgstr ""
 msgid "Download already running."
 msgstr "Tê daxistin..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
@@ -4045,37 +4031,37 @@ msgstr "Pakêtên şikestî tune."
 msgid "Asking whether to replace the configuration file %s"
 msgstr ""
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr ""
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "Pakêtên şikestî tune."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "Pakêtên şikestî tune."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr ""
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Pakêtên şikestî tune"
 msgstr[1] "Pakêtên şikestî tune"
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s guhartin"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s guhartin"
@@ -4083,7 +4069,7 @@ msgstr "%s guhartin"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4093,63 +4079,63 @@ msgstr[1] "%d sazkirin"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "Pakêtên şikestî tune"
 msgstr[1] "Pakêtên şikestî tune"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "%sB di (%sB/ç) de %s hatin daxistin."
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "ne sazkirî"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "Sazkirî"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "^Tam rakirin"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Parastin"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr ""
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr ""
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4186,7 +4172,7 @@ msgstr "na"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4231,16 +4217,16 @@ msgstr "le %s dê were sazkirin."
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "Lê bigere"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr ""
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr ""
@@ -4896,257 +4882,258 @@ msgstr ""
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr ""
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr ""
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr ""
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr ""
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr ""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr ""
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr ""
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr ""
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr ""
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "Guhertoya NCurses %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr ""
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "Guhertoya Apt: %s\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "Guhertoya Apt: %s\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr ""
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
 msgstr ""
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "Guhertoya NCurses: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr ""
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "Guhertoya Apt: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr ""
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr ""
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr ""
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, fuzzy, c-format
 msgid " remove       - Remove packages.\n"
 msgstr "Pakêtên şikestî tune."
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr ""
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr ""
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, fuzzy, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr "Bixweber hatiye sazkirin"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, fuzzy, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr "Ev paketên NÛ dê werin sazkirin:"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr ""
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr ""
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
 msgstr ""
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr ""
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr ""
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr ""
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr ""
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr ""
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr ""
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr ""
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr ""
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
 msgstr ""
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5154,7 +5141,7 @@ msgid ""
 "                why one or more packages would require the given package.\n"
 msgstr ""
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5163,285 +5150,265 @@ msgid ""
 "                lead to a conflict with the given package if installed.\n"
 msgstr ""
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr ""
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr ""
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr ""
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr ""
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
 msgstr ""
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
 msgstr ""
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr ""
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
 msgstr ""
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr ""
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies.\n"
 msgstr ""
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr ""
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr ""
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr ""
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 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:393
+#: src/main.cc:359
 #, fuzzy
 msgid "trace"
 msgstr "rast"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 msgid "info"
 msgstr "na"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 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:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "ÅŸaÅŸ"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
-#, c-format
-msgid "Invalid logger name \"%s\"."
-msgstr ""
-
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr ""
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr ""
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr ""
-
-#: src/main.cc:888
+#: src/main.cc:456
 #, c-format
-msgid "No comma following tag name \"%s\".\n"
+msgid "Invalid logger name \"%s\""
 msgstr ""
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "Pakêt"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "Hemû Pakêt"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5449,33 +5416,29 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr ""
 
-#: src/main.cc:1088
+#: src/main.cc:837
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:1105
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr ""
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
+msgid "Unknown command \"%s\""
 msgstr ""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr ""
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5491,7 +5454,7 @@ msgstr "Lê bigere:"
 msgid "Search backwards for: "
 msgstr ""
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr ""
 
@@ -5699,7 +5662,7 @@ msgstr ""
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 13 30 17 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Pakêt"
 
@@ -5780,8 +5743,8 @@ msgstr ""
 msgid "<none>"
 msgstr "<tune>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr ""
@@ -5915,7 +5878,7 @@ msgstr ""
 msgid "Internal error: Default column string is unparsable"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Peywir"
 
@@ -6054,21 +6017,17 @@ msgstr ""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr ""
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Pakêta Çavkaniyê:"
@@ -6641,7 +6600,7 @@ msgstr "Pêşbîr tê barkirin"
 msgid "Really quit Aptitude?"
 msgstr ""
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -6717,7 +6676,7 @@ msgstr ""
 msgid "License"
 msgstr "Lîsans"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 
@@ -6738,7 +6697,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Alîkarî"
 
@@ -6767,7 +6726,7 @@ msgstr ""
 msgid "FAQ"
 msgstr ""
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr ""
 
@@ -6802,15 +6761,15 @@ msgid ""
 "not see this message again."
 msgstr ""
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr ""
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Daxistina Pakêtan"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -6818,599 +6777,599 @@ msgid ""
 "what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr ""
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Bi Rastî Bidomîne"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr ""
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Bibe root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Nebe root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Lîsteyên paketan tên rojanekirin"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr ""
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr ""
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 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:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr ""
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr ""
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr ""
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr ""
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr ""
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr ""
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr ""
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr ""
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Minesweeper bileyîze"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^Bibe root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Derketin"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Sazkirin"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Rakirin"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Tam rakirin"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "Bi^hêle"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Parastin"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 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:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr ""
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 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:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "^Agahî"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr ""
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr ""
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr ""
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr ""
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr ""
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr ""
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr ""
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr ""
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr ""
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr ""
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr ""
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr ""
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr ""
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr ""
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr ""
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr ""
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Lêgerîn"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr ""
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr ""
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr ""
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr ""
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr ""
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr ""
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr ""
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr ""
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr ""
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Bigire"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr ""
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr ""
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr ""
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr ""
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr ""
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr ""
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Der barê"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr ""
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Alîkarî"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr ""
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Nûçe"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Lîsans"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Çalakî"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Lê bigere"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Opsiyon"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Bergeh"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7419,11 +7378,11 @@ msgstr ""
 "%ls: Menu %ls:Alîkarî %ls:Derketin %ls:Rojanekirin %ls:Daxistin/Sazkirin/"
 "Rakirina Pakêtan"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "e"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -7451,10 +7410,6 @@ msgstr "Tê daxistin "
 msgid "Downloading the changelog of %s"
 msgstr "Tê daxistin "
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr ""
-
 #~ msgid "Search for:"
 #~ msgstr "Lê bigere:"
 
@@ -7484,11 +7439,6 @@ msgstr ""
 #~ msgstr "Ev paketan rake:"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Çareserî nehat dîtin."
-
-#, fuzzy
 #~| msgid "Install the following packages:"
 #~ msgid "_Install/Remove Packages"
 #~ msgstr "Ev paketan saz bike:"
diff --git a/po/lt.gmo b/po/lt.gmo
index 49031edc..5d6bf3de 100644
--- a/po/lt.gmo
+++ b/po/lt.gmo
diff --git a/po/lt.po b/po/lt.po
index 25fc3897..c9660066 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude_lt\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:27+0800\n"
 "Last-Translator: Darius Žitkevi�ius <skystis@gmail.com>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -352,24 +352,10 @@ msgstr ""
 "faile sources.list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL adresas, iš kur paimami pakeitimų žurnalai"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Ši nuostata vado šabloną, kuris naudojamas atsisiun�iant pakeitimų sąrašus "
-"ir Debian svetainės.  Ją keisti reikia tik tuo atveju, jei pakeitimų sąrašai "
-"perkeliami į kitą svetainę."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Rodyti kas bus daroma prieš darant tai"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -377,12 +363,12 @@ msgstr ""
 "Jei įjungta, tuomet prieš vykdant diegimą, programa parodys vaizdą su visų "
 "numatytų atlikti veiksmų suvestine."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Atnaujinus paketų sąrašą užmiršti kurie paketai yra „nauji“"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -390,12 +376,12 @@ msgstr ""
 "Jei įjungta, tuomet atnaujinus paketų sąrašą (pvz. paspaudus 'u'), programa "
 "išalys naujų paketų sąrašą."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Po pašalinimo arba įdiegimo užmiršti kurie paketai yra „nauji“"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -404,13 +390,13 @@ msgstr ""
 "Jei įjungta, tuomet programa išalys naujų paketų sąrašą po kiekvieno paketų "
 "diegimo ar pašalinimo interaktyviai ar komandinės eilutės pagalba."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "Nerodyti įspėjimo, kai atliekamas pirmas pakeitimas tik skaitymo būsenoje"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -419,11 +405,11 @@ msgstr ""
 "Jei %Bišjungta%b, tuomet pakeitūs bet kokio paketo būseną ir neturint teisės "
 "pritaikyti šį pakeitimą sistemai, programa parodys įspėjimą."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr "Pranešti, jei paprastas naudotojas bando atlikti „root“ veiksmus"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -435,11 +421,11 @@ msgstr ""
 "galimybė įsisregistruoti kaip root vartotojos ir atlikti veiksmus turint "
 "reikiamas privilegijas."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Byla, kurioje fiksuojami visi veiksmai"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -451,11 +437,11 @@ msgstr ""
 "(pipe) simbolis ('%B|%b'), likusi pavadinimo dalis bus interpretuojama kaip "
 "aplinkos komanda."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Pažymėjus paketą, automatiškai pažymėti jam reikalingus paketus"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -467,11 +453,11 @@ msgstr ""
 "integruotÄ… resolver, bet gali pateikti neoptimalius rezultatus, ar kai "
 "kuriais atvejais gali nepavykti."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "Prieš diegiant/šalinant paketus automatiškai išspręsti priklausomybes"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -482,11 +468,11 @@ msgstr ""
 "aptitude automatiškai pritaikys resolver siūlomą sprendimą.  Priešingu "
 "atveju aptitude paklaus jūsų sugadinto paketo priklausomybių sprenimo."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Diegti rekomenduojamus paketus automatiškai"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -504,11 +490,11 @@ msgstr ""
 "šalinimas“, tuomet paketai, kuriuos rekomenduoja diegiamas paketas nebus "
 "automatiškai pašalinamas."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Automatiškai pašalinti nebenaudojamus paketus"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -525,11 +511,11 @@ msgstr ""
 "diegimas“, tuomet automatiškai įdiegti paketai nebus šalinami, nors jo ir "
 "nebereikÄ—s jakiam kitam paketui."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Paketai, kurie neturėtu būti automatiškai pašalinami"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -539,12 +525,12 @@ msgstr ""
 "taip kad atrodys jog kiti paketai nuo jų priklauso; jie niekada nebus "
 "Å¡alinami kaip nebenaudojami."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Lesti priklausomybių sprendimus, kurie sugadina, užlaiko arba uždraudžia"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -564,15 +550,15 @@ msgstr ""
 "apa�ioje). aptitude nepaisys sulaikymų automatiškai diegiant paketo, kuris "
 "pažytas diegimui ar atnaujinimui, priklausomybes dėl klaidos #470035."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "GUI parinktys"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Priklausomybių tvarkymas"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Kiti"
 
@@ -681,7 +667,7 @@ msgstr "Paketui „%s“ nėra išeities tektų paketo.\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Nepavyko patenkinti build-depends: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -690,7 +676,7 @@ msgstr ""
 "Dėmesio: paketas „%s“ pateikia virtualų paketą\n"
 "      „%s“ jau įdiegtas.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -699,7 +685,7 @@ msgstr ""
 "Dėmesio: paketas „%s“ pateikia virtualų paketą\n"
 "      „%s“ jau numatytas įdiegti.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -708,17 +694,23 @@ msgstr ""
 "Paketas „%s“ paketų duomenų bazėje yra, ta�iau\n"
 "jis nÄ—ra realus ir joks paketas jo nepateikia.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "„%s“ yra virtualus paketas pateiktas:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Jūs turite pasirinkti vieną įdiegimui.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "Paketas %s nėra įdiegtas, todėl negaliu uždrausti jo atnaujinimo\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -727,62 +719,55 @@ msgstr ""
 "Dėmesio: parenkant „%s“, o ne\n"
 "      virtualų paketą „%s“\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "tinkama paketo %s versija (%s) jau įdiegta\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s šiuo metu nėra įdiegtas, todėl negali būti įdiegtas iš naujo.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "tinkama paketo %s versija (%s) jau įdiegta\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s šiuo metu nėra įdiegtas, todėl negali būti įdiegtas iš naujo.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Paketas %s nėra įdiegtas, todėl negali būti pašalintas\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Paketas %s nėra įdiegtas, todėl negaliu uždrausti jo atnaujinimo\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Paketas %s neatnaujinamas, todėl negaliu uždrausti jo atnaujinimo\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Dėmesio: parenku užduotį „%s: %s“ diegimui\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Su komanda 'install' galima nurodyti tik paketo versijÄ… arba komandÄ… 'forbid-"
-"version'.\n"
+"version'"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Naudojant komandą „install“ galima nurodyti tik paketo archyvą\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Naudojant komandą „install“ galima nurodyti tik paketo archyvą"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -791,7 +776,7 @@ msgstr ""
 "Negaliu rasti paketo „%s“, daugiau nei 40\n"
 "paketų pavadinime turi frazę „%s“.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -800,14 +785,14 @@ msgstr ""
 "Negaliu rasti paketo „%s“.  Ta�iau šie \n"
 "paketai pavadinime turi frazę „%s“.\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Negaliu rasti nei vieno paketo, kurio pavadinime arba apraše būtų frazė "
 "„%s“\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -825,7 +810,7 @@ msgstr ""
 "Negaliu rasti paketo su fraze „%s“. Ta�iau šie\n"
 "paketai savo apraše turi frazę „%s“.\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Netinkamas veiksmo simbolis „%c“\n"
@@ -848,101 +833,85 @@ msgstr "Kld "
 msgid "Changelog download failed: %s"
 msgstr "Pasikeitimų sąrašas paketui %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Negaliu paleisti puslapiuotojo, ar tai veikianti Debian sistema?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s nėra oficialus Debian paketas, negaliu parodyti jo pakeitimų sąrašo."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Nerandu pakeitimų sąrašo bylos paketui %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "Nerandu pakeitimų sąrašo bylos paketui %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: Komanda clean nenaudoja jokių argumentų\n"
+msgid "The clean command takes no arguments"
+msgstr "Komanda clean nenaudoja jokių argumentų"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Trinti %s- %sdalinai/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr ""
 "Neįmanoma nustatyti jūsų namų katalogą, duomenyssaugomi į /tmp/function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Trinama %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: Komanda autoclean nenaudoja jokių argumentų\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Komanda autoclean nenaudoja jokių argumentų"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Atsilaisvins %sB\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Atlaisvinta %sB\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Klaidingas veiksmas %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Netikėtas argumentų derinys po „keep-all“"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
-"Nepavyko saugiai išspręsti priklausomybių, pabandykite su --full-resolver.\n"
+"Nepavyko saugiai išspręsti priklausomybių, pabandykite su --full-resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Atšaukti.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "atsisiuntimas: reikia nurodyti bent vienÄ… paketÄ… atsisiuntimui\n"
+msgid "download: you must specify at least one package to download"
+msgstr "atsisiuntimas: reikia nurodyti bent vienÄ… paketÄ… atsisiuntimui"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Negaliu nuskaityti šaltinių sąrašo"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Nerandu paketo, kurio pavadinimas „%s“"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -982,22 +951,14 @@ msgid "[Working]"
 msgstr "[Dirbu]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: reikalingas bent vienas argumentas (aplankas\n"
-"į kurį rašomi failai).\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Nėra tokio paketo „%s“"
+"extract-cache-entries: reikalingas bent vienas argumentas (aplankas į kurį "
+"rašomi failai)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
@@ -1005,11 +966,10 @@ msgstr ""
 "daryti.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: Komanda forget-new nenaudoja jokių argumentų\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Komanda forget-new nenaudoja jokių argumentų"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Turė�iau užmiršti kurie paketai yra nauji\n"
@@ -1117,17 +1077,17 @@ msgstr "Å ie paketai bus atnaujinti:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Šie dalinai įdiegti paketai bus sukonfigūruoti:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Å ie ESMINIAI paketai bus PAÅ ALINTI!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Jūsų veiksmai šiuos ESMINIUS paketus SUGADINS:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1136,16 +1096,16 @@ msgstr ""
 "DĖMESIO: Šie Jūsų veiksmai grei�iausiai sugadins Jūsų sistemą!\n"
 "         SUSTOKITE dabar, nebent jūs TIKSLIAI žinote ką darote!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Aš sunerimęs, nes manau kad tai tikrai bloga mintis"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Norėdami tęsti parašykite frazę „%s“:\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1161,7 +1121,7 @@ msgstr ""
 "Tęskite tik tuo atveju, jei esate įsitikinęs kad Jūs to norite.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1170,7 +1130,7 @@ msgstr ""
 "*** DĖMESIO ***   Ignoruojami šie patikimumo pažeidimai nes\n"
 "                  %s::CmdLine::Ignore-Trust-Violations yra 'true'!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1183,7 +1143,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1192,127 +1152,127 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Ar Jūs ignoruojate šį perspėjimą ir norite tęsti?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Norėdami tęsti parašykite frazę „%s“; norėdami sustoti įveskite „%s“: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Neatpažinta įvestis:  Įveskite „%s“ arba „%s“.\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Šie paketai yra REKOMENDUOJAMI, ta�iau jie nebus įdiegti:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Šie paketai yra SIŪLOMI, ta�iau jie nebus įdiegti:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Nei vienas paketas nebus įdiegtas, pašalintas arba atnaujintas.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paketų atnaujinta, %lu naujų paketų įdiegta, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu įdiegta iš naujo, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu pasendinta, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu bus pašalinta ir %lu ne atnaujinta.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Reikia gauti %sB/%sB archyvų. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Reikia gauti %sB archyvų. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Po išpakavimo bus panaudota %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Po išpakavimo atsilaisvins %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Nėra rodomų paketų -- įveskite paketų vardus eilutėje po „i“.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Norėdami tęsti spauskite ENTER."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Nerastas joks paketas -- įveskite paketų pavadinimus eilutėje po „c“.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "tęsti diegimą"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "atšaukti ir išeiti"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1320,12 +1280,12 @@ msgstr ""
 "Parodyti vieno ar kelių paketų informaciją; paketų pavadinimai turi būti po "
 "'i'"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1333,39 +1293,39 @@ msgstr ""
 "Rodyti vieno ar kelių Debian paketų pakeitimų žurnalus (changelog); paketų "
 "pavadinimai rašomi po 'c'"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "perjungti priklausomybių informacijos ekraną"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "įjungti/išjungti paketų dydžio pasikeitimo rodymą"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "įjungti/išjungti versijų rodymą"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1373,27 +1333,27 @@ msgstr ""
 "bandoma rasti priežastį diegti vieną paketą, arba paaiškinti, kodėl vieno "
 "paketo diegimas veda prie kito paketo diegimo."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "vykdyti automatinį priklausomybių sprendimo priemonę resolver, kad "
 "sutvarkyti priklausomybes."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "įveskite pilną vizualų interfeisą"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1405,45 +1365,45 @@ msgstr ""
 "derinius).  Veiksmai bus pritaikyti visiems išvardintiems paketams.  Galite "
 "naudoti Å¡iuos veiksmus:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' įdiegti paketus"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr "'+M' kad įdiegti ir tuoj pat pažymėti kaip automatiškai įdiegtus"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' kad pašalinti paketus"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' kad išvalyti (purge) paketus"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' kad užlaykyti paketą"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':' kad palikti paketą dabartinėje būklėje neužlaikant"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' kad pažymėti kaip automatiška įdiegtus"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' kad pažymėti kaip įdiegti rankiniu būdų"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "'&BD' kad įdiegti kompiliavimo priklausomybes paketui."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1451,29 +1411,29 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' kad pažymėti kaip automatiška įdiegtus"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Komandos:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1481,19 +1441,19 @@ msgstr ""
 "aptitude nepavyko rasti šių priklausomybių sprendimo.  Galite jas sutvarkyti "
 "pats, arba spauskite 'n' kad išeiti."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Ar tęsti? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Spręsti priklausomybes rankomis? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Neteisinga komanda.  Įveskite teisingą komandą, arba spauskite „?“.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1502,7 +1462,7 @@ msgstr ""
 "'R', kad pabandyti automatinį priklausomybių tvarkymą, arba 'N', kad "
 "atšaukti."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1513,7 +1473,7 @@ msgstr ""
 "Bus rodoma priklausomybių informacija.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1524,7 +1484,7 @@ msgstr ""
 "Priklausomybių informacija nebus rodoma.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1535,7 +1495,7 @@ msgstr ""
 "Bus rodomos versijos.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1546,7 +1506,7 @@ msgstr ""
 "Versijos nebus rodomos.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1557,7 +1517,7 @@ msgstr ""
 "Bus rodomi dydžio pakeitimai.\n"
 " \n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1689,6 +1649,11 @@ msgstr "Po '%c' tikÄ—tasi bent vienos paketas/versija poros"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Tikėtasi versijos arba „%s“ po „%s“"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Nėra tokio paketo „%s“"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1838,7 +1803,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr "Norima išspręsti priklausomybes, bet nesukurtas joks resolver."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1867,7 +1832,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Galimos Å¡ios komandos:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Byla į kurią įrašyti sprendimų būseną: "
 
@@ -1899,7 +1864,7 @@ msgstr ""
 "*** KAIDA: paieška sustabdyta dėl esminės klaidos.  Galima tęsti\n"
 "           paiešką, bet kai kurie sprendimai bus nepasiekiami."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1908,25 +1873,24 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Nepavyksta išspręsti atnaujinimo priklausomybių (sprendimas nerastas)."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Nepavyksta išspręsti atnaujinimo priklausomybių (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "%s iconv nepavyko.\n"
+msgid "iconv of %s failed"
+msgstr "%s iconv nepavyko"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "paieška: Jūs turite įvesti bent vieną paieškos žodį\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "paieška: Jūs turite įvesti bent vieną paieškos žodį"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1970,7 +1934,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Šių paketų priklausomybės netenkinamos:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2193,7 +2157,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Pateikia"
 
@@ -2207,15 +2171,9 @@ msgstr "Aprašas: "
 msgid "Homepage: "
 msgstr "SvetainÄ—: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nepavyko surasti paketÄ… %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Nepavyko interpretuoti derinio %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Paketų nerasta"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2226,14 +2184,13 @@ msgstr "Gau�iau/dieg�iau/šalin�iau paketus.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Vidinė klaida, nebaigtas rūšiavimas"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Trinamos pasenusios gautos bylos"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: Komanda „update“ nenaudoja jokių argumentų\n"
+msgid "The update command takes no arguments"
+msgstr "Komanda „update“ nenaudoja jokių argumentų"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2251,43 +2208,37 @@ msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 "%s: per mažai argumetų; tikėtasi bent jau žymės pavadinimo ir paketo.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "NÄ—ra tinkamos versijos paketui %s\n"
+msgid "No candidate version found for %s"
+msgstr "NÄ—ra tinkamos versijos paketui %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Paketui %s nerasta dabartinÄ— arba kandidatuojama versija\n"
+msgid "No current or candidate version found for %s"
+msgstr "Paketui %s nerasta dabartinÄ— arba kandidatuojama versija"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Negaliu rasti archyvo „%s“ paketui „%s“\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Negaliu rasti archyvo „%s“ paketui „%s“"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Negaliu rasti paketo „%1s“ versijos „%2s“\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Negaliu rasti paketo „%1s“ versijos „%2s“"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
 msgstr ""
-"Vidinė klaida: komandai cmdline_find_ver perduota netinkama reikšmė %i!\n"
+"Vidinė klaida: komandai cmdline_find_ver perduota netinkama reikšmė %i!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Jus negalite nurodyti paketo archyvÄ… ir versijÄ… vienu metu\n"
-
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nerandu pakeitimų sąrašo bylos paketui %s"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Jus negalite nurodyti paketo archyvÄ… ir versijÄ… vienu metu"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
@@ -2295,7 +2246,7 @@ msgstr[0] "%d sugadintas [%+d]"
 msgstr[1] "%d sugadinti [%+d]"
 msgstr[2] "%d sugadintų [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
@@ -2303,7 +2254,7 @@ msgstr[0] "%d atnaujintas [%+d]"
 msgstr[1] "%d atnaujinti [%+d]"
 msgstr[2] "%d atnaujintų [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
@@ -2311,12 +2262,12 @@ msgstr[0] "%d naujas [%+d]"
 msgstr[1] "%d nauji [%+d]"
 msgstr[2] "%d naujų [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Dabartinė būsena: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
@@ -2324,7 +2275,7 @@ msgstr[0] "Yra %d naujai nebegaliojantis paketas."
 msgstr[1] "Yra %d naujai nebegaliojantys paketai."
 msgstr[2] "Yra %d naujai nebegaliojan�ių paketų."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
@@ -2332,57 +2283,85 @@ msgstr[0] "Yra %d naujai nebegaliojantis paketas: "
 msgstr[1] "Yra %d naujai nebegaliojantys paketai: "
 msgstr[2] "Yra %d naujai nebegaliojan�ių paketų: "
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Nėra kablelio po žymės pavadinimo „%s“"
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nepavyko surasti paketÄ… %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Nerandu pakeitimų sąrašo bylos paketui %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Dėmesio: parenku užduotį „%s: %s“ diegimui\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Nerandu pakeitimų sąrašo bylos paketui %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Paketai"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Kilęs iš paketo: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "Archyvas"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "paieška: Jūs turite įvesti bent vieną paieškos žodį\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2405,7 +2384,7 @@ msgstr "Dabartinis"
 msgid "Candidate"
 msgstr "Kandidatas"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Įdiegti"
 
@@ -2508,20 +2487,18 @@ msgstr "Nepavyko rasti priežasties įdiegti %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Paketai, kuriems reikia %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Nerandu paketo, pavadinimu „%s“."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Nepavyko interpretuoti kai kurių derinių."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, fuzzy, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr "%s: ši komanda reikalauja bent vieno argumento (paketo užklausai)."
 
 #: src/cmdline/cmdline_why.h:212
@@ -2551,11 +2528,11 @@ msgstr "NETINKAMAS"
 msgid "UNAVAILABLE"
 msgstr "NEEGZISTUOJA"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Žymės"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Vatotojo Žymės"
 
@@ -2762,32 +2739,32 @@ msgstr ""
 "kitas apt įrankis jau diegia paketus.  Atidaroma tik skaitymui; bet kokie "
 "paketų būsenos pakeitimai NEBUS išsaugoti!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 msgid "allowed"
 msgstr "leisti_pasirikti"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "pagrindiniai"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2854,34 +2831,42 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr "Nėra paketų talpyklės; neįmanoma gauti ir įdiegti paketus."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Vidinė klaida: negaliu sugeneruoti atsisiun�iamų paketų sąrašo"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Nepavyko gauti %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Nepavyko parsiųsti kai kurių archyvų, pabandykite paleisti „aptitude update“ "
+"arba pabandykite su parametru --fix-missing?"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Negaliu sutvarkyti neegzistuojan�ių paketų"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Nepavyko įdiegti paketo.  Bandoma sutvarkyti:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3033,13 +3018,13 @@ msgstr ""
 "\n"
 "Žurnalas užbaigtas.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "Gaunu paketus"
@@ -3148,18 +3133,18 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Paketo indeksas sugadintas. Pakete %s nėra įrašo su bylos pavadinimu."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Pasikeitimų sąrašas paketui %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "URL adresas, iš kur paimami pakeitimų žurnalai"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL adresas, iš kur paimami pakeitimų žurnalai"
@@ -3208,26 +3193,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nepavyko interpretuoti derinio %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Generuojama žymių duombazė"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "Neįdiegtas"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "Neįdiegtas"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3377,41 +3363,41 @@ msgstr ""
 msgid "_File"
 msgstr "Ne"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Vykdyti numatytus veiksmus"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Ieškoti naujų paketų versijų"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Pažymėti visus atnaujinamus paketus, kurie nesulaikomi nuo atnaujinimo."
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Pamiršti kurie paketai yra „nauji“"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Atšaukti visus paruoštus diegimus, pašalinimus, sulaikymus ir atnaujinimus."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Ištrinti paketus, kurie buvo atsiųsti anks�iau"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Pašalinti paketus, kurių nebeįmanoma gauti"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Perkrauti paketų krepšį"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3421,7 +3407,7 @@ msgstr ""
 "Paleiskite komandą „su“, kad taptumėte root;  Programa startuos iš naujo, "
 "bet visi jūsų nustatymai išliks."
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Išeiti iš programos"
 
@@ -3429,7 +3415,7 @@ msgstr "Išeiti iš programos"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Atšaukti paskutinį veiksmą, arba operacijų grupę."
 
@@ -3463,7 +3449,7 @@ msgid "_Help"
 msgstr "Pagalba"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3472,19 +3458,19 @@ msgstr ""
 msgid "Update"
 msgstr "Atnaujinimų sąrašas"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Paketai"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Peržiūra"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Sprendimai"
 
@@ -3671,7 +3657,7 @@ msgid "Fix Manually"
 msgstr "Rankinis"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "atnaujinti"
 
@@ -4206,11 +4192,11 @@ msgstr "Įdiegtas"
 msgid "Reinstall"
 msgstr "Įdiegti iš naujo"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Sendinti"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Å alinti"
 
@@ -4246,7 +4232,7 @@ msgstr "Pritaikyti filtrą paketų sąrašui"
 msgid "Download already running."
 msgstr "Gaunu... "
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Paketų atnaujinimas arba diegimas jau vyksta."
 
@@ -4307,26 +4293,26 @@ msgstr "Nėra blogų paketų."
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Negaliu pakeisti bylos %s nauja konfigūracijos byla"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Gaunu paketus"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "Nėra blogų paketų."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "Nėra blogų paketų."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "Išspręsti priklausomybes"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
@@ -4334,12 +4320,12 @@ msgstr[0] "Bėra blogų paketų."
 msgstr[1] "Bėra blogų paketų."
 msgstr[2] "Bėra blogų paketų."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s pakeitimų"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s pakeitimų"
@@ -4347,7 +4333,7 @@ msgstr "%s pakeitimų"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4358,7 +4344,7 @@ msgstr[2] "%d diegiamas"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
@@ -4366,57 +4352,57 @@ msgstr[0] "Nepavyko pašalinti %s"
 msgstr[1] "Nepavyko pašalinti %s"
 msgstr[2] "Nepavyko pašalinti %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "Reikia atsisiųsti"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "neįdiegtas"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "Įdiegtas"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "iš^naikinti"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Palikti"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Sulaikyti"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "Naudotojo instrukcijos"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4456,7 +4442,7 @@ msgstr "ne"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4501,17 +4487,17 @@ msgstr "%s; bus įdiegtas automatiškai"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "Paieška"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "Kuriu vaizdÄ…"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Kuriu vaizdÄ…"
@@ -5218,108 +5204,109 @@ msgstr "Nežinomas lygiavimo tipas „%s“"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Rikiavimo pagal vardą taisyklės nenaudoja jokių argumentų"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Tuš�ias rūšiavimo taisyklės vardas nepriimtinas"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Rūšiavimo taisyklių aprašuose neuždarytas „(“"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Netinkamas rūšiavimo taisyklių tipas „%s“"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Nepavyko dekoduoti keleto bitų eilutės po „%ls“"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Nepavyko dekoduoti pla�ių raidžių po „%s“"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s kompiliuotas %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompiliatorius: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Kompiliuota prieš:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt versija %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  NCurses versija: Nežinoma\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  NCurses versija %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++ versija: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Ept palaikymas įjungtas.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Ept palaikymas išjungtas.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt versija %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt versija %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Ept palaikymas išjungtas.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s kompiliuotas %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Ept palaikymas išjungtas.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5327,32 +5314,32 @@ msgstr ""
 "\n"
 "Esamos bibliotekų versijos:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  NCurses versija: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  cwidget versija: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Apt versija: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Naudojimas: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [parinktys] <veiksmas> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5361,64 +5348,64 @@ msgstr ""
 "  Veiksmai (jei nenurodyti jokie parametrai, aptitude veiks interaktyviai):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Įdiegti/atnaujinti paketus.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Pašalinti paketus.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge        - Pašalinti paketus ir jų konfigūracijos bylas (išvalyti).\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Sulaikyti paketų atnaujinimą.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Atšaukti paketų sulaikymą.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 " markauto     - Pažymėti paketus taip, kad atrodytu jog jie įdiegti "
 "automatiškai.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr ""
 " unmarkauto   - Pažymėti paketus taip, kad atrodytu jog jie įdiegti rankiniu "
 "būdu.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr " forbid-version - Uždrausti atnaujinimą į nurodytą versiją.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Atsisiųsti naują paketų sąrašą.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Vykdyti saugų atnaujinimą.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5427,52 +5414,52 @@ msgstr ""
 " full-upgrade - Vykdyti atnaujinimą, leidžiamas paketų diegimas ir "
 "Å¡alinimas.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' kad įdiegti kompiliavimo priklausomybes paketui."
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Užmiršti kurie paketai yra „nauji“.\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Paketo paieška pagal pavadinimą ir/arba išraišką.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Rodyti detaliÄ… paketo informacijÄ….\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Rodyti detaliÄ… paketo informacijÄ…\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Pašalinti gautų paketų bylas.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Pašalinti senas gautas paketų bylas.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Žiūrėti paketo pakeitimų sąrašą.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Gauti paketo .deb bylÄ….\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5481,7 +5468,7 @@ msgstr ""
 " reinstall    - Gauti ir (galbūt) įdiegti iš naujo šiuo metu įdiegtą "
 "paketÄ….\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5492,7 +5479,7 @@ msgstr ""
 "paketas arba\n"
 "                kodėl vienas ar daugiau paketų reikalautu nurodyto paketo.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5506,44 +5493,44 @@ msgstr ""
 "diegiant\n"
 "                sukelia konfliktÄ….\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Parinktys:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Å i pagalbos informacija.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Å i pagalbos informacija\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simuliuoti veiksmus, ta�iau nieko realaus nevykdyti.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -5551,18 +5538,18 @@ msgstr ""
 " -d             Tik atsisiųsti reikalingus paketus nieko nediegti ir "
 "nešalinti.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Visada klausti veiksmų patvirtinimo.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             Į klausimus taip/ne automatiškai atsakyti „taip“.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5571,7 +5558,7 @@ msgstr ""
 " -F formatas    Nurodyti kokių formatu rodyti paieškos rezultatus žr. "
 "instrukcijÄ….\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5580,34 +5567,34 @@ msgstr ""
 " -O tvarka      Nurodyti kaip rūšiuoti paieškos rezultatus; žr. "
 "instrukcijoje.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w plotis      Nuodyti ekrano plotį, paieškos rezultatų formavimui.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Bandyti tvarkyti sugadintus paketus agresyviai.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Rodyti kurios paketų versijos bus įdiegtos.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             Rodyti automatiškai pakeistų paketų priklausomybes.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z             Rodyti įdiegtų paketų dydžio pasikeitimus.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5616,13 +5603,13 @@ msgstr ""
 " -v             Rodyti papildomą informaciją (gali būti naudojamas kelis "
 "kartus).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [release]   Nustatyti iš kurių paketų diegti.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5630,12 +5617,12 @@ msgid ""
 msgstr ""
 " -q             KomandinÄ—je eilutÄ—je nerodyti progreso indikatoriaus.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o raktas=reikšmė      Tiesiogiai siųsti parametrą „raktas“.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5645,165 +5632,141 @@ msgstr ""
 "paketus\n"
 "                kaip reikalingus.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fname       Skaityti aptitude išplėstinės būsenos informaciją iš bylos "
 "fname.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Tik paleidus programą gauti naują paketų sąrašą.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr ""
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Paleidus programą automatiškai vykdyti diegimą.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Šis aptitude neturi Superkarvės galių.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 msgid "trace"
 msgstr "tesinga"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 msgid "info"
 msgstr "ne"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 msgid "error"
 msgstr "Kld "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "klaidinga"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Klaidingas veiksmas %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr ""
-"Po -q=\n"
-" tikėtasi skai�iaus\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
-"Po -q=\n"
-" tikėtasi skai�iaus, gauta %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o reikalauja argumentų formate raktas=reikšmė, gavau %s\n"
 
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Nėra kablelio po žymės pavadinimo „%s“.\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "KEISTA: gautas nežinomas parink�ių kodas\n"
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "Paketas"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "Visi paketai"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5811,36 +5774,31 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Gali būti nurodytas tik vienas iš -u ir -i\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr "-u ir -i nenaudojami komandinės eilutės režime (pvz., su „install“)"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u ir -i negali būti nurodyti su komanda"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Nežinoma komanda „%s“\n"
+msgid "Unknown command \"%s\""
+msgstr "Nežinoma komanda „%s“"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Nežinoma išimtis: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5858,7 +5816,7 @@ msgstr "Ieškoti: "
 msgid "Search backwards for: "
 msgstr "Ieškoti atgal: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Minų laukas"
 
@@ -6069,7 +6027,7 @@ msgstr "Bylos mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Paketas"
 
@@ -6150,8 +6108,8 @@ msgstr "<NÄ—ra>"
 msgid "<none>"
 msgstr "<nieko>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtualus"
@@ -6285,7 +6243,7 @@ msgstr "Neįmanoma perkoduoti paketo rodymo formato po „%ls“"
 msgid "Internal error: Default column string is unparsable"
 msgstr "VidinÄ— klaida: nesuprantama stulpelio eilutÄ—"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Užduotys"
 
@@ -6440,11 +6398,11 @@ msgstr "Indeksų pora turi būti 1 ar daugiau, ne „%s“"
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "Poros indeksas %ls yra per didelis; galimos grupÄ—s yra Å¡ios (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PAKETAI BE ŽYMIŲ"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6454,10 +6412,6 @@ msgstr ""
 " Å ie paketai nÄ—ra klasifikuoti debtags duombazÄ—je, arba nerasta debtas "
 "duombazė (įdiegus debtags problema gali būti išspręsta)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "TRŪKSTA ŽYMĖS"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Kilęs iš paketo: "
@@ -7068,7 +7022,7 @@ msgstr "Įkeliamas krepšys"
 msgid "Really quit Aptitude?"
 msgstr "Tikrai išeinate iš Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Pakeisti aptitude elgesį"
 
@@ -7151,7 +7105,7 @@ msgstr ""
 msgid "License"
 msgstr "Licenzija"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Rodyti sÄ…lygas, pagal kurias JÅ«s galite platinti ir kopijuoti aptitude"
 
@@ -7172,7 +7126,7 @@ msgstr "Pagalba internete"
 msgid "View a brief introduction to aptitude"
 msgstr "Skaityti programos aptitude trumpą įžangą"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Pagalba"
 
@@ -7201,7 +7155,7 @@ msgstr "Rankinis"
 msgid "FAQ"
 msgstr "DUK"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Rodyti dažniausiai užduodamų klausimų sąrašą"
 
@@ -7244,15 +7198,15 @@ msgstr ""
 "pašalinti šį aplanką ir jo turinį?  Jei pasirinksite „Ne“, šio pranešimo "
 "nebematysite."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Rodyti paketo gavimo progresÄ…"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Paketo gavimas"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7263,35 +7217,35 @@ msgstr ""
 "paketai gali %Bpažeisti Jūsų sistemos saugumą%b. Tęskite diegimą tik tuo "
 "atveju, jei esate įsitikinęs, kad tai yra būtent tai ko jūs norite.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versija %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Tikrai tęsti"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Atšaukti diegimą"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Peržiūrėti paketo diegimą"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Žiūrėti ir/arba keisti veiksmus, kurie bus vykdomi"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Kai kurie paketai buvo sugadinti ir buvo sutvarkyti:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Šioms priklausomybių problemoms sprendimo nėra!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7300,7 +7254,7 @@ msgstr ""
 "Bandant sutvarkyti priklausomybes baigÄ—si tam skirtas laikas (spauskite %s, "
 "kad labiau pasistengti)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7308,19 +7262,19 @@ msgstr ""
 "Norėdami įdiegti/pašalinti paketus turite turėti administratoriaus (root) "
 "privilegijas, kurių jūs neturite.  Ar norite pereiti į „root“ paskyrą?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Tapti root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Netapti root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Jokio paketo įdiegimas, pašalinimas ar atnaujinimas neplanuojamas."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7330,19 +7284,19 @@ msgstr ""
 "būtų galima atnaujinti, ta�iau jūs nenurodėte juos atnaujinti. Spauskite „U“ "
 "kad paruošti atnaujinimą."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Atnaujinamas paketų sąrašas"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Stebėti paketų sąrašo atnaujinimo progresą"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Atnaujinimų sąrašas"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7350,23 +7304,23 @@ msgstr ""
 "Norint atnaujinti paketų sąrašą reikalingos administratoriaus privilegijos, "
 "kurių jūs šiuo metu neturite. Ar norite pereiti į root paskyrą?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Gaištate laiką bandydami rasti minas"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Valymas tuo metu, kai gaunami paketai, draudžiamas"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Trinu gautas bylas"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Gautos paketų bylos ištrintos"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7375,19 +7329,19 @@ msgstr ""
 "Norint atnaujinti paketų sąrašą reikalingos administratoriaus privilegijos, "
 "kurių jūs šiuo metu neturite. Ar norite pereiti į root paskyrą?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 "Apt talpyklė nepasiekiama; automatini išvalymas (auto-clean) neįmanomas."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Pasenę gauti paketai ištrinti, atlaisvinta %sB."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7396,121 +7350,121 @@ msgstr ""
 "Norint atnaujinti paketų sąrašą reikalingos administratoriaus privilegijos, "
 "kurių jūs šiuo metu neturite. Ar norite pereiti į root paskyrą?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Sprendimų nebėra."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Nepavyko rasti sprendimo."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Ieškant sprendimo baigėsi tam skirtas laikas."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Išspręsti priklausomybes"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Ieškoti būdų išspręsti netinkamas priklausomybes"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Nepavyko atidaryti %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Klaida iškraunant sprendimų būseną"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Diegti/Å¡alinti paketus"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Atnaujinti paketų sąrašą"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Pažymėti kaip ^atnaujinamą"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Pamiršti naujus paketus"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Atšaukti ^visus veiksmus"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Valyti paketų krepšį"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "^IÅ¡valyti pasenusius paketus"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Perdaryti paketų krepšį"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "Žaisti ^Minų lauką"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^Tapti root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Baigti"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Atšaukti"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "Įd^iegti"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Pažymėti dabartinį paketą diegti arba atnaujinti"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Pašalinti"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Pažymėti šį paketą, kaip šalinamą"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "iš^naikinti"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Pažymėti šį paketą ir jo konfigūracinius failus, kaip šalinamus"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Palikti"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Atšaukti šiam paketui visus veiksmus"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Sulaikyti"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7518,11 +7472,11 @@ msgstr ""
 "Atšaukti šiam paketui visus veiksmus, ir apsaugoti jį nuo ateities "
 "atnaujinimų"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Pažymėti ^Auto"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7530,11 +7484,11 @@ msgstr ""
 "Pažymėti parinktus paketus kaip įdiegtus automatiškai; tuomet jie bus "
 "automatiškai pašalinti, kai jų nebereikės kitiems paketams"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Žymėti ^Ne automatinis"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7542,11 +7496,11 @@ msgstr ""
 "Pažymėti pasirinktus paketus, kaip įdiegtus rankiniu būdu; jie nebus "
 "pašalinti tol, kol to nepadarysite rankiniu būdu"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Uždrausti Versiją"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7554,19 +7508,19 @@ msgstr ""
 "Uždrausti pažymėto paketo siūlomą versiją; naujesnės paketo versijos bus "
 "įdiegtos kaip įprasta"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformacija"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Parodyti daugiau informacijos apie pažymėtą paketą"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "^Keisti paketo informacijÄ…"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7576,59 +7530,59 @@ msgstr ""
 "aprašymas, priklausomybių būsenos suvestinė arba paaiškinimas, kodėl šis "
 "paketas yra būtinas."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr " Pakeitimų ^sąrašas"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Rodyti šio paketo Debian pakeitimų sąrašą (changelog)"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Peržiūrėti sprendimą"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Peržiūrėti pažymėto sprendimo priklausomybių problemas."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Pritaikyti ^sprendimÄ…"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Atlikti veiksmus, kurie numatyti pažymėtame sprendime."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Sekantis sprendimas"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Pasirinkite sekantį priklausomybių problemų sprendimą."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^Ankstesnis sprendimas"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Pasirinkite ankstesnį priklausomybių problemų sprendimą."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^Pirmas sprendimas"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Pasirinkite pirmą priklausomybių problemų sprendimą."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "^Paskutinis sprendimas"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7636,35 +7590,35 @@ msgstr ""
 "Pasirinkite paskutinį priklausomybių , kurios iki šiol buvo sugeneruotos, "
 "problemų sprendimą."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Keisti ^Atmestas"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Pakaitomis žymėti šį veiksmą kaip atmesta."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Pakaitomis ^Pataisytas"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Pakaitomis žymėti šį veiksmą kaip pataisytą."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Rodyti taikinį"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Rodyti paketus, kurie bus įtakoti šio veiksmo"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Atmesti trukdan�ius Sulaik^ymus"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7672,135 +7626,135 @@ msgstr ""
 "Atmesti visus veiksmus, kurie pakei�ia sulaikytų paketų būsenas arba įdiegia "
 "uždraustas versijas"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Rasti"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Ieškoti pirmyn"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "^Ieškoti atgal"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Ieškoti atgal"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Rasti ^VÄ—l"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Pakartoti paskutinę paiešką"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Ieškoti vėl ^atgal"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Pakartoti paskutinę paiešką atgaline kryptimi"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Apriboti ekranÄ…"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Pritaikyti filtrą paketų sąrašui"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Neriboti ekrano"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Nebenaudoti paketų sąrašo filtro"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Rasti ^BlogÄ…"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Rasti sekantį blogą paketą"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Nustatymai"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^Aplinkos parinktys"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Pakeisti nustatymus, susijusius su naudotojo aplinka"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Priklausomybių tvarkymas"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Keisti nustatymus, kurie turi įtakos darbui su paketų priklausomybėmis"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Kitkas"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Keisti kitus programos nustatymus"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "Atstatyti ^parinktis"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Atstatyti sistemos pradinius nustatymus"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Sekantis"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Pereiti į sekantį ekraną"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Atgal"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Pereiti į ankstesnį ekraną"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Uždaryti"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Uždaryti šį ekraną"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Sekantis paketų ^vaizdas"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Sukurti naują standartinį paketų rodymą"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Patikrinti ^rekomendacijas"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7808,87 +7762,87 @@ msgstr ""
 "Rodyti paketus, kurie yra rekomenduojami įdiegiamų paketų, ir jie šiuo metu "
 "nėra įdiegti."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Sekantis ^plokš�ias paketų sąrašas"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Rodyti visus sistemos paketus viename sąraše be kategorijų"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Nauja ^debtags naršyklė"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Naršyti paketus pagal debtag duomenis"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "^Nauja kategorijų naršyklė"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Naršyti paketus pagal kategorijas"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Apie"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Rodyti informacijÄ… apie Å¡iÄ… programÄ…"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Pagalba"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Rodyti pagalbÄ…"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "Naudotojo ^instrukcijos"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Rodyti detalizuotas naudotojo instrukcijas"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^DUK"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "Nau^jienos"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Rodyti svarbius pakeitimus, kurie atsirado kiekvienoje versijoje "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licencija"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Veiksmai"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Paieška"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Parinktys"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Rodymas"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7897,11 +7851,11 @@ msgstr ""
 "%ls: Meniu %ls: Pagalba %ls: Baigti %ls: Atnaujinti %ls: Gauti/Diegti/"
 "Å alintiPkt"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "t"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -7929,9 +7883,53 @@ msgstr "URL adresas, iš kur paimami pakeitimų žurnalai"
 msgid "Downloading the changelog of %s"
 msgstr "Gaunu pakeitimų sąrašą"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Oficialių Debian paketų pakeitimų sąrašą galima tik skaityti."
+#~ msgid "MISSING TAG"
+#~ msgstr "TRŪKSTA ŽYMĖS"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL adresas, iš kur paimami pakeitimų žurnalai"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Ši nuostata vado šabloną, kuris naudojamas atsisiun�iant pakeitimų "
+#~ "sąrašus ir Debian svetainės.  Ją keisti reikia tik tuo atveju, jei "
+#~ "pakeitimų sąrašai perkeliami į kitą svetainę."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s nėra oficialus Debian paketas, negaliu parodyti jo pakeitimų sąrašo."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Nerandu paketo, kurio pavadinimas „%s“"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Nepavyko interpretuoti derinio %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr ""
+#~ "Po -q=\n"
+#~ " tikėtasi skai�iaus\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr ""
+#~ "Po -q=\n"
+#~ " tikėtasi skai�iaus, gauta %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o reikalauja argumentų formate raktas=reikšmė, gavau %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "KEISTA: gautas nežinomas parink�ių kodas\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u ir -i negali būti nurodyti su komanda"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Oficialių Debian paketų pakeitimų sąrašą galima tik skaityti."
 
 #~ msgid "Err "
 #~ msgstr "Kld "
@@ -8104,11 +8102,6 @@ msgstr "Oficialių Debian paketų pakeitimų sąrašą galima tik skaityti."
 #~ msgstr "Gaunu pakeitimų sąrašą"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Sprendimas nerastas."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Negaliu atidaryti paketo hierarchijos bylos %s"
diff --git a/po/mr.gmo b/po/mr.gmo
index 7279378f..467fdb2e 100644
--- a/po/mr.gmo
+++ b/po/mr.gmo
diff --git a/po/mr.po b/po/mr.po
index 47a70971..739410aa 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:27+0800\n"
 "Last-Translator: Priti Patil <prithisd@gmail.com>\n"
 "Language-Team: <janabhaaratii@cdacmumbai.in>\n"
@@ -311,70 +311,59 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "बदल नोंदी उतरवून घेण�यासाठी यूआर�ल(URL) वापरावीत"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "काही करण�यपूर�वी, काय करण�यात येईल त�याचे पूर�वदृश�य प�रदर�शित करा. "
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 "पॅकेज सूची जेव�हा अद�ययावत केल�या जातात, तेव�हा कोणती पॅकेजेस \"new\" (नवीन) आहेत, ते विसरून "
 "जा."
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "पॅकेजेस जेव�हा संस�थापित होतात किंवा काढून टाकली जातात, तेव�हा कोणती पॅकेजेस \"new"
 "\" (नवीन) आहेत, ते विसरून जा."
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "पहिला बदल जेव�हा फक�त-वाचन प�रकारात केला जातो, तेव�हा इशारा प�रदर�शित करू नका."
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr " अ-मूळ उपभोक�ता म�हणून विशेषाधिकारित कृती करण�यचा प�रयत�न करताना इशारा द�या.  "
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -382,11 +371,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "कृतींची नोंद घेण�यासाठी फाइल."
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -394,11 +383,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "पॅकेज जेव�हा निवडले जाते, तेव�हा त�याची अवलंबित�वे स�वंयंचलित प�रकारे दूर करा."
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -406,12 +395,12 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "भंगलेली पॅकेजेस संस�थापित करण�यापूर�वी किंवा काढून टाकण�यापूर�वी स�वयंलित प�रकारे द�र�स�त करा."
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -419,12 +408,12 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 #, fuzzy
 msgid "Install recommended packages automatically"
 msgstr "शिफारशीकृत पॅकेजेस स�वयंचलित प�रकारे संस�थापित करा"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -435,11 +424,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "न वापरलेली पॅकेजेस स�वयंचलित प�रकारे काढून टाका."
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -450,22 +439,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -478,17 +467,17 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 #, fuzzy
 msgid "UI options"
 msgstr "यू आय पर�याय"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 #, fuzzy
 msgid "Dependency handling"
 msgstr "डिपेंडन�सी हाताळणे"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "संकिर�ण"
 
@@ -588,7 +577,7 @@ msgstr "पॅकेज \"%s\"साठी फाइलसंच \"%s\"शोध
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "\"%s\"मधल�या फाइल�स सांगण�यास  असमर�थ"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -597,7 +586,7 @@ msgstr ""
 "सूचनाः \"%s\", आभासी पॅकेज प�रवत आहे\n"
 " ,\"%s\"आधीच संस�थापित आहे.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -606,7 +595,7 @@ msgstr ""
 "सूचनाः \"%s\", आभासी पॅकेज प�रवत आहे\n"
 " ,\"%s\"आधीच संस�थापित केले जाणार आहे.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -615,19 +604,25 @@ msgstr ""
 "\"%s\"पॅकेज माहिती संचात अस�तित�वात आहे, परंतू ते खरे (वास�तव) पॅकेज नाही व कोणतेही पॅकेज तसे "
 "प�रवत नाही.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr ""
 "\"%s\" हे आभासी पॅकेज ः\n"
 " ने प�रवलेले  आहे.\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "संस�थापित करण�यासाठी त�म�ही �क निवडायलाच हवे.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "%s पॅकेज संस�थापित केलेले नाही,दर�जा उंचावण�यासाठी मनाई करता येत नाही\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -636,62 +631,54 @@ msgstr ""
 "सूचनाः आभासी पॅकेज \"%s\" \n"
 " �वजी \"%s\" निवडत आहे \n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "विनंती केलेल�या व�हर�जन वर(आवृत�ती वर)(%s),%s आधीच संस�थापित केलेला आहे.\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s सध�या संस�थापित केलेला नाही, म�हणून तो प�नर�संस�थापित होणार नाही. \n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "विनंती केलेल�या व�हर�जन वर(आवृत�ती वर)(%s),%s आधीच संस�थापित केलेला आहे.\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s सध�या संस�थापित केलेला नाही, म�हणून तो प�नर�संस�थापित होणार नाही. \n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "%s पॅकेज संस�थापित केलेले नाही म�हणून ते काढून टाकले जाणार नाही\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "%s पॅकेज संस�थापित केलेले नाही,दर�जा उंचावण�यासाठी मनाई करता येत नाही\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "%s पॅकेज दर�जा उंचवण�याक�षम नाही,दर�जा उंचावण�यासाठी मनाई करता येत नाही\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "सूचनाः संस�थापित करण�यासाठी \"%s:%s\" कामाची निवड करीत आहे.\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
-"पॅकेजची आवृत�ती त�म�ही फक�त 'संस�थापित करा' आज�ञेने किंवा 'निषिध�द-आवृत�ती' आज�ञेनेच नमूद करू "
-"शकता.\n"
+"पॅकेजची आवृत�ती त�म�ही फक�त 'संस�थापित करा' आज�ञेने किंवा 'निषिध�द-आवृत�ती' आज�ञेनेच नमूद करू शकता"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "पॅकेजचा फाइलसंच त�म�ही केवळ'संस�थापित करा' आज�ञेनेच नमूद करू शकता.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "पॅकेजचा फाइलसंच त�म�ही केवळ'संस�थापित करा' आज�ञेनेच नमूद करू शकता"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -700,19 +687,19 @@ msgstr ""
 "पॅकेज \"%s\"शोधता आले नाही, \n"
 "व ४० हून जास�त पॅकेजेसच�या नावात \"%s\"आहे.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
 "packages contain \"%s\" in their name:\n"
 msgstr "\"%s\"पॅकेज शोधू शकलो नाही. तरीदेखिल, प�ढील पॅकेजेसच�या नावात \"%s\"आहे \n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "\"%s\"नावाशी किंवा वर�णनाशी ज�ळणारे कोणतेही पॅकेज मिळू शकले नाही\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -729,7 +716,7 @@ msgid ""
 msgstr ""
 "\"%s\"शी ज�ळणारे कोणतेही पॅकेज मिळू शकले नाही.परंत� प�ढील पॅकेजेसच�या वर�णनामध�ये \"%s\"आहे.\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "वाईट कृती अक�षर '%c'\n"
@@ -752,29 +739,24 @@ msgstr "Err"
 msgid "Changelog download failed: %s"
 msgstr "%s च�या बदलनोंदी"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "समंजस (जाणता)-पेजर कार�यान�वित करू शकत नाही, ही काम करणारी डेवियन-पध�दती आहे का?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "%s हे औपचारिक डेवियन पॅकेज नाही, त�यातील बदलनोंद प�रदर�शित करता येत नाही"
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "%sसाठी बदलनोंद मिळू शकत नाही"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "%sसाठी बदलनोंद मिळू शकत नाही"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, fuzzy, c-format
-msgid "E: The clean command takes no arguments\n"
+#, fuzzy
+msgid "The clean command takes no arguments"
 msgstr "E:अद�ययावत करा ही आज�ञा कोणतेही विवाद विधान घेत नाही \n"
 
 #: src/cmdline/cmdline_clean.cc:66
@@ -782,73 +764,65 @@ msgstr "E:अद�ययावत करा ही आज�ञा कोणत
 msgid "Del %s* %spartial/*\n"
 msgstr "%s*% spartial/*खोडा\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr ""
 "त�मच�या गृहसंचयिकेवर (आरंभ संचयिकेवर) नजर टाकण�यास असमर�थ,/tmp/"
 "function_pkgs!             मध�ये जतन करीत आहे"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "%s %s [%sB] खोडा \n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, fuzzy, c-format
-msgid "E: The autoclean command takes no arguments\n"
+#: src/cmdline/cmdline_clean.cc:127
+#, fuzzy
+msgid "The autoclean command takes no arguments"
 msgstr "E:अद�ययावत करा ही आज�ञा कोणतेही विवाद विधान घेत नाही \n"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, fuzzy, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "डिस�कवरील जागेपैकी %SBम�क�त करेल\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, fuzzy, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "डिस�कवरील जागेपैकी %Sbमोकळी केली\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "अवैध क�रिया %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "\"keep-all\" (सर�व ठेवा) नंतर अनपेक�षित नम�ना विधान"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, fuzzy, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+#, fuzzy
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr "अवलंबित�वे दूर करण�यास असमर�थ"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "वििच�छेद करा \n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
+msgid "download: you must specify at least one package to download"
 msgstr ""
-"डाउनलोड (उतरवून घेणे)ः डाउनलोड करण�यासाठी त�म�हांला किमान �क पॅकेज तरी नमूद करायलाच "
-"हवे\n"
+"डाउनलोड (उतरवून घेणे)ः डाउनलोड करण�यासाठी त�म�हांला किमान �क पॅकेज तरी नमूद करायलाच हवे"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "स�त�रोत सूची वाचू शकले नाही"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "\"%s\"नावाचे पॅकेज सापडत नाही"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -889,30 +863,22 @@ msgid "[Working]"
 msgstr "(काम करीत आहे)"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "\"%s\"सारखे कोणतेही पॅकेज नाही"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, fuzzy, c-format
-msgid "E: The forget-new command takes no arguments\n"
+#, fuzzy
+msgid "The forget-new command takes no arguments"
 msgstr "E:अद�ययावत करा ही आज�ञा कोणतेही विवाद विधान घेत नाही \n"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "कोणती पॅकेजेस नवी आहेत ते विसरून जाईल\n"
@@ -1022,17 +988,17 @@ msgstr "प�ढील पॅकेजेसचा दर�जा उंचा
 msgid "The following partially installed packages will be configured:"
 msgstr "प�ढील पॅकेजेसचा दर�जा उंचावण�यात येईलः "
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "प�ढील अत�यावश�यक पॅकेजेस काढून टाकण�यात येतील!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "ह�या कृतीने प�ढील अत�यावश�यक पॅकेजेस भंगतीलः\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1041,16 +1007,16 @@ msgstr ""
 "इशाराः ही कृती केल�यास त�मची प�रणाली कदाचित भंगेल(त�टेल)!\n"
 "त�म�ही नेमके काय करीत आहात ते समजल�याखेरीज काम प�ढे स�रू ठेवू नका!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "ही अत�यंत वाईट कल�पना आहे, याची मला जाणीव आहे."
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "काम प�ढे स�रू ठेवण�यासाठी,\"%s\" टाइप कराः\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1064,7 +1030,7 @@ msgstr ""
 "अविश�वासपात�र पॅकेजेस त�मच�या प�रणालीच�या स�रक�षिततेशी तडजोड करू शकतात.\n"
 "हीच कृती करायची आहे,अशी खात�री असेल तरच संस�थापन प�ढे स�रू ठेवा.\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1073,7 +1039,7 @@ msgstr ""
 "**धोक�याची सूचना*** ह�या विश�वास उल�लंघनाकडे द�र�लक�ष करीत आहे, कारण \n"
 "%s::CmdLine::द�र�लक�ष करा - विश�वास-उल�लंघने हे 'सत�य' आहे !\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 #, fuzzy
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1087,7 +1053,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1096,201 +1062,201 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "ह�या धोक�याच�या सूचनेकडे द�र�लक�ष करूल त�म�हाला तसेच प�ढे जायचे आहे का?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "प�ढे स�र� ठेवण�यासाठी \"%s\"प�रविष�ट करा, विच�छेद करण�यासाठी  \"%s\":प�रविष�ट करा."
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "अपरिचित अगत. �कतर \"%s\" किंवा \"%s\" प�रविष�ट करा \n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "प�ढील पॅकेजेस शिफारशीकृत आहेत परंत� संस�थापित करण�यात येणार नाहीत.\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "प�ढील पॅकेजेस स�चवण�यात आलेली आहेत परंत� संस�थापित करण�यात येणार नाहीत\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 "कोणतीही पॅकेजेस संस�थापित केली जाणार नाहीत, स�धारित आवृत�ती काढण�यात येणार नाही किंवा "
 "काढून टाकली जाणार नाहीत.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr " %luपॅकेजेसचा दर�जा उंचावला,%lu नव�याने संस�थापित केली,"
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%luप�र�नसंस�थापित केली."
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%luचा दर�जा कमी केला."
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr " %lu काढून टाकायची आहेत व %lu ची स�धारित आवृत�ती काढलेली नाही.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr " फाइलसंचातून %sB/%sB मिळवण�याची गरज आहे "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr " फाइलसंचातून %sB/ मिळवण�याची गरज आहे "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr " गठ�ठ�यातून स�टे केल�यावर %sB वापरता येईल \n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr " अनपॅक केल�यावर(गठ�ठ�यातून स�टे केल�यावर)%sB मोकळे होईल\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "दाखवण�यासाठी पॅकेजेस नाहीत—- रेषेवर 'i'नंतर पॅकेजची नावे लिहा.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "प�ढे स�र� ठेवण�यासाठी रिटर�न (प�न�हा परत येणे)दाबा."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "पॅकाजेस सापडली नाहीत—- - रेषेवर 'c'नंतर पॅकेजेसची नावे लिहा\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "संस�थापन प�ढे स�र� ठेवा"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "विच�छेद करा व सोडा"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr "�क किंवा अधिक पॅकेजेस विषयी माहिती दाखवा. पॅकेजेसची नावे 'i'नंतर असावीत"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
 msgstr "�क किंवा अधिक पॅकेजेसच�या डेबियन बदलनोंदी दाखवा,पॅकेजेसची नावे 'c'नंतर असावीत"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "अवलंबित�व माहितीचे प�रदर�शन टाॅगल करा"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "पॅकेजेसच�या आकारातील बदलांचे प�रदर�शन टाॅगल करा"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "आवृत�ती क�रमांकाचे प�रदर�शन टाॅगल करा"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "संपूर�ण दृश�य संवादमंच प�रविष�ट करा"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1301,46 +1267,46 @@ msgstr ""
 "कृती अक�षर व त�यानंतर �क किंवा अधिक पॅकेज नावे (किंवा नम�ने)टाइप करा. त�मच�या सूचीतील सर�व "
 "पॅकेजेसना कृती लागू केली जाईल.प�ढील कृती उपलब�ध आहेतः"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+'पॅकेजेस संस�थापित करण�यासाठी"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M'पॅकेजेस संस�थापित करणे व त�यावर स�वयंचलितपणे संस�थापित असा तात�काळ �ेंडा लावणे यासाठी"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-'पॅकेजेस काढून टाकण�यासाठी"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'-'पॅकेजेस श�ध�द,साफ करण�यासाठी"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' पॅकेजेसना तसेच थांबवून ठेवण�यासाठी"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':'पॅकेजेसना तसेच थांबवून न ठेवता त�यांच�या सद�यस�थितीत ठेवण�यसाठी"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M'स�वयंचलितपणे संस�थापित अशी खूण पॅकेजेसवर करण�यासाठी"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr " '&M'हाताने (माणसाकडून) संस�थापित अशी खूण पॅकेजेस करण�यासाठी"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1348,53 +1314,53 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M'स�वयंचलितपणे संस�थापित अशी खूण पॅकेजेसवर करण�यासाठी"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "आज�ञाः"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "त�म�हाला काम प�ढे स�र�च ठेवायचे आहे का? (हो / नाही/?)"
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "अवैध प�रतिसाद. कृपया वैध आज�ञा प�रविष�ट करा किंवा मदतीसाठी '?'\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1405,7 +1371,7 @@ msgstr ""
 "अवलंबित�व माहिती दाखवली जाईल. \n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1416,7 +1382,7 @@ msgstr ""
 "अवलंबित�व माहिती दाखवली जाणार नाही \n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1427,7 +1393,7 @@ msgstr ""
 "आवृत�त�या दाखवल�या जातील.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1438,7 +1404,7 @@ msgstr ""
 "आवृत�त�या दाखवल�या जाणार नाहीत.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1449,7 +1415,7 @@ msgstr ""
 "आकारातील बदल दाखवले जातील.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1577,6 +1543,11 @@ msgstr "%cनंतर किमान à¤�क पॅकेज / आà¥�वृतà
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "\"%s\"नंतर �क आवृत�ती अपेक�षित आहे"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "\"%s\"सारखे कोणतेही पॅकेज नाही"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1723,7 +1694,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1751,7 +1722,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "प�ढील आज�ञा उपलब�ध आहेत."
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "   ला उत�तरे देणारी स�थिती लिहिण�यासाठी फाइलः"
 
@@ -1783,7 +1754,7 @@ msgid ""
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1792,25 +1763,24 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "अवलंबित�वे दूर करण�यास असमर�थ !सोडून देत आहे"
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "अवलंबित�वे दूर करण�यास असमर�थ"
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "%s चे प�रतिक अयशस�वी �ाले \n"
+msgid "iconv of %s failed"
+msgstr "%s चे प�रतिक अयशस�वी �ाले"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "शोधाः त�म�ही किमान �क तरी शोधसंज�ञा प�रवायला हवी \n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "शोधाः त�म�ही किमान �क तरी शोधसंज�ञा प�रवायला हवी"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1853,7 +1823,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "प�ढील पॅकेजेस मध�ये पूर�वी न मिळालेली अवलंबित�वे आहेतः \n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "< व�यर�थ >"
@@ -2076,7 +2046,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "प�रवीत आहे"
 
@@ -2090,15 +2060,9 @@ msgstr "वर�णन"
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "%s पॅकेजची जागा शोधण�यास असमर�थ"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "%sनम�न�यातील लहान परस�परसंबध (पार�स) दाखवण�यास असमर�थ"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "पॅकेजेस सापडले नाहीत"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2109,14 +2073,13 @@ msgstr "पॅकेजेस उतरवून घेईल / संसà¥�थà
 msgid "Internal Error, Ordering didn't finish"
 msgstr "अंतर�गत त�र�टी, मागणी संपली नाही"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "डाउनलोड केलेल�या फाईल�स मिटवत आहे"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E:अद�ययावत करा ही आज�ञा कोणतेही विवाद विधान घेत नाही \n"
+msgid "The update command takes no arguments"
+msgstr "E:अद�ययावत करा ही आज�ञा कोणतेही विवाद विधान घेत नाही"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, fuzzy, c-format
@@ -2133,129 +2096,151 @@ msgstr " \"%s\"पॅकेजसाठी आवृत�ती\"%s\" शोे
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "%sसाठी कोणतीही उमेदवार आवृत�ती सापडली नाही\n"
+msgid "No candidate version found for %s"
+msgstr "%sसाठी कोणतीही उमेदवार आवृत�ती सापडली नाही"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "%s साठी कोणतीही सद�य किंवा उमेदवार आवृत�ती सापडली नाही\n"
+msgid "No current or candidate version found for %s"
+msgstr "%s साठी कोणतीही सद�य किंवा उमेदवार आवृत�ती सापडली नाही"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "पॅकेज \"%s\"साठी फाइलसंच \"%s\"शोधण�यात असमर�थ \n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "पॅकेज \"%s\"साठी फाइलसंच \"%s\"शोधण�यात असमर�थ"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr " \"%s\"पॅकेजसाठी आवृत�ती\"%s\" शोेधण�यात असमर�थ\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr " \"%s\"पॅकेजसाठी आवृत�ती\"%s\" शोेधण�यात असमर�थ"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, fuzzy, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
 msgstr ""
 "अंतर�गत त�र�टी ः cmdline_find_ver!\n"
 " ची सदोष किंमत पाठवली ! \n"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "पॅकेजसाठी फाइलसंच व आवृत�ती हे दोन�हीही त�म�ही नमूद करू शकत नाही\n"
-
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "%sसाठी बदलनोंद मिळू शकत नाही"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "पॅकेजसाठी फाइलसंच व आवृत�ती हे दोन�हीही त�म�ही नमूद करू शकत नाही"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "%s पॅकेजची जागा शोधण�यास असमर�थ"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "%sसाठी बदलनोंद मिळू शकत नाही"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "सूचनाः संस�थापित करण�यासाठी \"%s:%s\" कामाची निवड करीत आहे.\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "%sसाठी बदलनोंद मिळू शकत नाही"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "पॅकेजेस"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "उद�गमस�त�रोत पॅकेजः"
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "फाइलसंच"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "शोधाः त�म�ही किमान �क तरी शोधसंज�ञा प�रवायला हवी \n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2281,7 +2266,7 @@ msgstr ""
 msgid "Candidate"
 msgstr "CandVer"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "संस�थापित करा"
 
@@ -2385,21 +2370,19 @@ msgstr "अप�लाय करण�यासाठी उत�तर शो
 msgid "Packages requiring %s:"
 msgstr "%sवर अवलंबून असणारी पॅकेजेस"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, fuzzy, c-format
 msgid "No package named \"%s\" exists."
 msgstr "\"%s\"नावाचे पॅकेज सापडत नाही"
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 #, fuzzy
 msgid "Unable to parse some match patterns."
 msgstr "%sनम�न�यातील लहान परस�परसंबध (पार�स) दाखवण�यास असमर�थ"
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 
 #: src/cmdline/cmdline_why.h:212
@@ -2426,11 +2409,11 @@ msgstr "असमाधानी"
 msgid "UNAVAILABLE"
 msgstr "अन�पलब�ध"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "टॅग�ज (ख�णेच�या पट�ट�या)"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 #, fuzzy
 msgid "User Tags"
 msgstr "टॅग�ज (ख�णेच�या पट�ट�या)"
@@ -2638,31 +2621,31 @@ msgstr ""
 "अस�थाइ स�मृतीकोष फाइल क�ल�पबंद करता आली नाही. केवळ-वाचन प�रकारात उघडत आहे ! पॅकेजेसच�या "
 "स�थितीत त�म�ही काही बदल केल�यास ते संरक�षित (परिरक�षित) केले जाणार नाही!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "प�रम�ख (म�ख�य)"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2729,37 +2712,43 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "अस�थाइ स�मृतीकोष पॅकेज उपलब�ध नाही, पॅकेजेस उतरवून घेण�यात (डाउनलोड करण�यात) व संस�थापित "
 "करण�यास असमर�थ."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 "अंतर�गत चूकः उतरवून घेण�यासाठी (डाउनलोड करण�यासाठी) पॅकेजेसची सूची निर�माण करता आली नाही."
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, fuzzy, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "%s चे %sअसे प�नर�नामकरण करण�यात अपयश"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "अन�पलब�ध पॅकेजेससाठी योग�य ते करण�यात असमर�थ"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "पॅकेज संस�थापित होण�यात अयशस�वी �ाले, सावर�न नीट करण�याचा प�रयत�नात आहे."
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2908,13 +2897,13 @@ msgstr ""
 "\n"
 "नोंद पूर�ण,\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "पॅकेजेस डाउनलोड करत आहे"
@@ -3023,18 +3012,18 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "पॅकेजच�या अन�क�रमणिका फाइल�स भ�रष�ट �ाल�या आहेत. फाइल नाव नाहीः पॅकेज %sसाठी क�षेत�र."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "%s च�या बदलनोंदी"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "बदल नोंदी उतरवून घेण�यासाठी यूआर�ल(URL) वापरावीत"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "बदल नोंदी उतरवून घेण�यासाठी यूआर�ल(URL) वापरावीत"
@@ -3083,26 +3072,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "%sनम�न�यातील लहान परस�परसंबध (पार�स) दाखवण�यास असमर�थ"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "टॅग (ख�णेचे चिन�ह) माहितीसंचाची बांधणी करीत आहे."
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "संस�थापित केले नाही"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "संस�थापित केले नाही"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3251,39 +3241,39 @@ msgstr ""
 msgid "_File"
 msgstr "बंद करा"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "राहीलेली संस�थापने आणि काढून टाकणे पूर�ण करा"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "पॅकेजेसच�या नवीन आवृत�तींसाठी परिक�षण करा"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "प�ढिल आवृत�तीत न करणारी , प�ढिल आवृत�तीत पॅकेजेस चिन�हांकित करा."
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "कोणती पॅकेजेस नवीन आहेत ते विसरा"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "राहिलेली सगळी संस�थापने काढून टाकणे थांबवलेले स�धारित आवृत�तीत रद�द करा."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "आधिच डाऊनलोड केलेल�या पॅकेज फाईल�स काढून टाका."
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "डाउनलोड करता न येण�यासारखी पॅकेजेस काढून टाका"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "पॅकेजचा अस�थाई स�मृतीकोष प�नः स�थापित करा."
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3292,7 +3282,7 @@ msgid "Restart the program as root; your settings will be preserved"
 msgstr ""
 "मूळापर�यंत पोहोचण�यासाठी 'सू' चालवा. याम�ळे त�मची रचना जतन राहून आज�ञावली प�न�हा स�र� होईल."
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "आज�ञावलीतून बाहेर पडा"
 
@@ -3300,7 +3290,7 @@ msgstr "आज�ञावलीतून बाहेर पडा"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "क�रियांचा सम�ह किंवा मागची पॅकेज क�रिया यांचा बदल रद�द करा"
 
@@ -3334,7 +3324,7 @@ msgid "_Help"
 msgstr "मदत"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3343,19 +3333,19 @@ msgstr ""
 msgid "Update"
 msgstr "स�धारणांची यादी करा"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "पॅकेजेस"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "प�न�हा बघा"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "रि�ाॅल�वर"
 
@@ -3542,7 +3532,7 @@ msgid "Fix Manually"
 msgstr "प�स�तिका"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "दर�जा उंचवा (प�ढील स�धारित आवृत�ती)"
 
@@ -4075,11 +4065,11 @@ msgstr "संस�थापित केले"
 msgid "Reinstall"
 msgstr "प�र�नसंस�थापित करा"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "दर�जा कमी करा (निम�न आवृत�ती)"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "काढून टाका"
 
@@ -4115,7 +4105,7 @@ msgstr "पॅकेज यादीला गाळणी फिलà¥�टर à¤
 msgid "Download already running."
 msgstr "डाउनलोडिंग (उतरवून घेत आहे)"
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "पॅकेज यादी स�धारीत आवृत�ती किंवा संस�थापित चालवा आधिच स�र� आहे."
 
@@ -4176,37 +4166,37 @@ msgstr "त�टलेली पॅकेजेस नाहीत"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "%sच�या बदली नवीन संरचना फाइल टाकण�यात असमर�थ"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "पॅकेजेस डाउनलोड करत आहे"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "त�टलेली पॅकेजेस नाहीत"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "त�टलेली पॅकेजेस नाहीत"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "डिपेंडंसीज  अवलंबित�वे"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "क�ठलेही पॅकेजेस त�टलेले नाहीत"
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s बदलं"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s बदलं"
@@ -4214,7 +4204,7 @@ msgstr "%s बदलं"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4223,63 +4213,63 @@ msgstr[0] "%d संस�थपित करा"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%s काढून टाकण�यात अपयश"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "उतरवून घेण�याचा आकार (डाउनलोड आकार)"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "संस�थापित केले नाही"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "संस�थापित केले"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "^स�वच�छ करा"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "ठेवा"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "धरून ठेवा"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "उपयोजन प�स�तिका"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4317,7 +4307,7 @@ msgstr "नाही"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4362,17 +4352,17 @@ msgstr "%s;सà¥�वयंचलितपणे संसà¥�थापित कà
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "शोध"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "दृष�य बांधत आहे"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "दृष�य बांधत आहे"
@@ -5064,113 +5054,114 @@ msgstr "अज�ञात अलाइनमेंट प�रकार '%s'"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "नावान�सार वर�गवारी धोरणे विवाद विधाने घेत नाहीत"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "अवैध शून�य-लांबी वर�गवारी धोरण नाव."
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "न ज�ळणारे '('वर�गवारी धोरण वर�णनात"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "अवैध वर�गवारी धोरण प�रकार '%s'"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, fuzzy, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "\"%|s\"नंतर बह�ूबाइट अक�षरसंचाचे कोडसंकेत उलगडू शकत नाही."
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "\"%s\"नंतर र�ंद-अक�षर अक�षरसंचाचे कोडसंकेत उलगडू शकत नाही."
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s चे संकलन %s %sकडे केले\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr " संकलक :g++%s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 #, fuzzy
 msgid "Compiled against:\n"
 msgstr " संकलक :g++%s\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, fuzzy, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  %F %s(%s) आवृत�तीत ठेवा"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, fuzzy, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 "\n"
 "%sआवृत�तीचा N अपशब�द स�नवतो \n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, fuzzy, c-format
 msgid "  NCurses version %s\n"
 msgstr ""
 "\n"
 "%sआवृत�तीचा N अपशब�द स�नवतो \n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, fuzzy, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "libsigc++आवृत�ती : %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  %F %s(%s) आवृत�तीत ठेवा"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  %F %s(%s) आवृत�तीत ठेवा"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s चे संकलन %s %sकडे केले\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:181
 #, fuzzy
 msgid ""
 "\n"
@@ -5179,36 +5170,36 @@ msgstr ""
 "\n"
 " आवृत�तीला आपशब�द स�नवतो :%s\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, fuzzy, c-format
 msgid "  NCurses version: %s\n"
 msgstr ""
 "\n"
 "%sआवृत�तीचा N अपशब�द स�नवतो \n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, fuzzy, c-format
 msgid "  cwidget version: %s\n"
 msgstr "libsigc++आवृत�ती : %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, fuzzy, c-format
 msgid "  Apt version: %s\n"
 msgstr ""
 "\n"
 " आवृत�तीला आपशब�द स�नवतो :%s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr " उपयोग ः नैसर�गिक कल [-S fname] [-u|-i]  "
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "नैसर�गिक कल (पर�याय) < कृती >----"
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5217,60 +5208,60 @@ msgstr ""
 "कृती (काहीच नमूद केले नसल�यास, कल परस�परसहभागी पध�दत प�रविष�ट करेल)ः:\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, fuzzy, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr "संस�थापित करा - पॅकेजेस संस�थापित करा / स�धारित आवृत�ती काढा \n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, fuzzy, c-format
 msgid " remove       - Remove packages.\n"
 msgstr "काढून टाका - पॅकेजेस काढून टाका\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, fuzzy, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr "श�ध�द व साफ करा - पॅकेजेस व त�यांच�या संरचना फाइल�स काढून टाका\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, fuzzy, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr "तसेच धरून ठेवा - पॅकेजेस तशीच धरून ठेवा\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, fuzzy, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr "धरून ठेवू नका - पॅकेजसाठीची धरून ठेवा आज�ञा रद�द करा\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, fuzzy, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr "स�वयंची खूण करा - पॅकेजेस स�वयंचलितपणे संस�थापित �ाल�याची खूण करा \n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, fuzzy, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr "स�वयंची खूण करू नका - पॅकेजेस हाताने संस�थापित �ाल�याची खूण करा\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr "निषिध�द -आवृत�ती -प�रवृत�तीला विशिष�ट पॅकेजची स�धारित आवृत�ती काढण�यास मनाई करा \n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, fuzzy, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr ""
 "अद�ययावत करा - नवीन /दर�जा वाढवण�याक�षम पॅकेजेसच�या सूची उतरवून घ�या (डाउनलोड करा)\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, fuzzy, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr "स�धारित आवृत�ती काढा (दर�जा वाढवा) - स�रक�षित स�धारित आवृत�ती काढा \n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, fuzzy, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5279,53 +5270,53 @@ msgstr ""
 "dist-स�धारित आवृत�ती काढा - स�धारित आवृत�ती काढा, शक�यतर पॅकेजेस संस�थापित करणारी व काढून "
 "टाकणारी \n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, fuzzy, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr "नवीन विसरून जा - कोणती पॅकेजेस \"new(नवीन)\" आहेत ता विसरून जा \n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, fuzzy, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr "शोधा - पॅकेजसाठी नावान�सार आणि / किंवा अभिव�यक�तीन�सार शोध घ�या \n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, fuzzy, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr "दाखवा - पॅकेजविषयीची तपशीलवार (विस�तृत) माहिती प�रदर�शित करा \n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr "दाखवा - पॅकेजविषयीची तपशीलवार (विस�तृत) माहिती प�रदर�शित करा \n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, fuzzy, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr ""
 "स�वच�छ करा (साफ करा) - उतरवून घेतलेल�या (डाउललोड केलेल�या) पॅकेज फाइल�स खोडून टाका\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, fuzzy, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr "स�वयंसफाई करा - ज�न�या उतरवून घेतलेल�या पॅकेज फाइल�स खोडून टाका\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, fuzzy, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr "बदलनोंद - पॅकेजमधील बदलनोंदीचे दृश�य दाखवा\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, fuzzy, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr "डाउनलोड करा (उतरवून घ�या) - पॅकेजसाठी .debफाइल उतरवून घ�या \n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, fuzzy, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5333,7 +5324,7 @@ msgid ""
 msgstr ""
 "प�नर�संस�थापित  करा - सध�या संस�थापित केलेले पॅकेज उतरवून घ�या व(शक�य तर)प�नर�संस�थापित करा \n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, fuzzy, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5341,7 +5332,7 @@ msgid ""
 "                why one or more packages would require the given package.\n"
 msgstr "-Z\t\t प�रत�येक पॅकेजच�या संस�थापित आकारात �ालेला बदल दाखवा \n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, fuzzy, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5350,44 +5341,44 @@ msgid ""
 "                lead to a conflict with the given package if installed.\n"
 msgstr "-Z\t\t प�रत�येक पॅकेजच�या संस�थापित आकारात �ालेला बदल दाखवा \n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "पर�याय ः \n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, fuzzy, c-format
 msgid " -h             This help text.\n"
 msgstr "-hहे मजक�रासाठी मदत करते \n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr "-hहे मजक�रासाठी मदत करते \n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr "-s   कृतींची नक�कल करते, परंत� प�रत�यक�षात त�या कृती करत नाही.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -5395,18 +5386,18 @@ msgstr ""
 "-d पॅकेजेस फक�त डाउनलोड करते (उतरवून घेते), संस�थापित करीत नाही किंवा काहीही काढून टाकत "
 "नाही.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, fuzzy, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr "-p   खात�री करून घेण�यासाठी किंवा कृतींसाठी नेहमीच तत�पर \n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, fuzzy, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr "-y   साध�या होय /नाही प�रश�नांसाठी उत�तर होय आहे असे गृहीत धरा \n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, fuzzy, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5415,48 +5406,48 @@ msgstr ""
 "-f   विहित नम�ना शोध निकाल प�रदर�शित करण�यासाठी विहित नम�ना नमूद करा, माहीती प�स�तक "
 "पहा.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, fuzzy, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
 msgstr "-O आदेश शोधनिकालांची वर�गवारी कशी करावी ते नमूद करा, माहितीप�स�तक पहा, \n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, fuzzy, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr "-w शोधनिकाल नम�न�यात मांडण�यासाठी दृश�यमाध�यमाची रूंदी नमूद करा.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr "-f  भंगलेली पॅकेजेस द�रूस�त करण�याचा जोरदार प�रयत�न करा.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr "  -V   पॅकेजेसच�या कोणत�या आवृत�त�या संस�थापित करायच�या आहेत ते दाखवा.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr "-D स�वयंचलितपणे बदललेल�या पॅकेजेसची परावलंबित�वे दाखवा.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, fuzzy, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr "-Z\t\t प�रत�येक पॅकेजच�या संस�थापित आकारात �ालेला बदल दाखवा \n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, fuzzy, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
 msgstr "-V  अतिरिक�त माहिती प�रदर�शित करा. (अनेक वेळा ती प�रवली जाऊ शकते) \n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, fuzzy, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
@@ -5464,19 +5455,19 @@ msgstr ""
 "-t  (म�क�त करण�यात येणारी आवृत�ती) ज�यातून पॅकेजेस संस�थापित करायची आहेत, ती आवृत�ती निश�चित "
 "(स�थापित) करा \n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, fuzzy, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr "-q आज�ञा-रेखा प�रकारात, वाढीव प�रगती निदर�शक दाबून ठेवा. \n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, fuzzy, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr "-o key=val (कळ =मूल�य) key नावाचा संरचना पर�याय थेट स�थापित करा \n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, fuzzy, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5485,159 +5476,139 @@ msgstr ""
 "--with(out)-recommends\t शिफारशींना जोरदार परावलंबित�वे म�हणून वागवावे की नाही ते "
 "स�पष�ट करा \n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, fuzzy, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr "-S fname: fname मधून कल विस�तारित स�थिती माहिती वाचा .\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, fuzzy, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr "-u   ः संगणक स�रू केल�यावर नवीन पॅकेज सूची डाउनलोड करा (उतरवून घ�या) \n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr "-hहे मजक�रासाठी मदत करते \n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, fuzzy, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr "-i  संगणक स�रू केल�यावर संस�थापन प�रोग�राम (आज�ञावली) स�रू करा.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "ह�या प�रवृत�तीत स�पर काऊ पॅावर�स (श�रेष�ठ गाय शक�ती) नाहीत.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 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:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 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:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 msgid "error"
 msgstr "Err"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 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:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "अवैध क�रिया %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "-q नंतर �क क�रमंाक अपेक�षित आहे.\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "-q नंतर �क क�रमंाक अपेक�षित आहे. %sे मिळाले \n"
-
-#: src/main.cc:798
-#, fuzzy, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr " कळ=मूल�य स�वरूपाचे विधान -O ला हवे आहे,%s मिळाले."
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "गूढता ः अज�ञात पर�याय संकेत मिळाला.\n"
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "पॅकेज"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "सर�व पॅकेजेस"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5645,36 +5616,31 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "-u व -i पैकी फक�त �कच नमूद करता येईल. \n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr "आज�ञा-रेखा प�रकारात -u व-i नमूद करणारही नाहीत(उदा.'संस�थापित करा' सह)"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "आज�ञेसोबत  -u व -i नमूद केले नसेलही "
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "अज�ञात आज�ञा  \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "अज�ञात आज�ञा  \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr " न पकडलेला अपवाद ः %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, fuzzy, c-format
 msgid ""
 "Backtrace:\n"
@@ -5690,7 +5656,7 @@ msgstr "ह�यासाठी शोधाः"
 msgid "Search backwards for: "
 msgstr "ह�यासाठी पाठीमागे शोध घ�या"
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "खाणशोधक"
 
@@ -5903,7 +5869,7 @@ msgstr " mine -help.txt|UTF-8 चे कोडसंकेत तयार कà¤
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "पॅकेज"
 
@@ -5984,8 +5950,8 @@ msgstr "लागू नाही"
 msgid "<none>"
 msgstr "काहीही नाही"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "आभासी"
@@ -6119,7 +6085,7 @@ msgstr "      नंतर पॅकेज प�रदर�शित करण
 msgid "Internal error: Default column string is unparsable"
 msgstr "अंतर�गत त�र�टीः मूलभूत स�तंभ अक�षरसंच लहान परस�परसंबंधात विभागता येण�यासारखा नाही"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "कामे"
 
@@ -6275,21 +6241,17 @@ msgstr "घातांक ज�ळणी , �क किंवा त�या
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "घातांक ज�ळणी %lsफारच मोठी आहे,उपलब�ध गट (%s)आहे"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "TAGLESS PACKAGES (टॅग नसलेली पॅकेजेस)"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "MISSING TAG (गहाळ टॅग)"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "उद�गमस�त�रोत पॅकेजः"
@@ -6891,7 +6853,7 @@ msgstr "असà¥�थाई  सà¥�मृतिकोष दाखल करीà¤
 msgid "Really quit Aptitude?"
 msgstr "अॅप�टीट�य�ड मध�न खरच बाहेर पडायचं आहे का?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -6973,7 +6935,7 @@ msgstr ""
 msgid "License"
 msgstr "^परवाना"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 #, fuzzy
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "ज�यांच�या खाली आज�ञावलीची नक�कल बनवता येईल असे शब�द दाखवा."
@@ -6995,7 +6957,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "मदत"
 
@@ -7025,7 +6987,7 @@ msgstr "प�स�तिका"
 msgid "FAQ"
 msgstr "�फ � क�यू"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "नेहमी विचारल�या जाणाऱ�या प�रश�नांची यादी दाखवा."
 
@@ -7068,15 +7030,15 @@ msgstr ""
 "माहीती काढून टाकायची आहे का? जर त�म�ही निवड केली \"नाही\" ही सूचना त�म�हाला प�न�हा "
 "दिसणार नाही."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "पॅकेज डाउनलोड होण�याची प�रगती बघा."
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "पॅकेजेस डाउनलोड "
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7087,35 +7049,35 @@ msgstr ""
 "पॅकेजेस  ही %b काॅॅॅंप�रोमाईज त�मच�या प�रणालीची सिक�यूरिटी जर त�म�हाला तूम�ही काय करीत आहात "
 "याबद�दस खात�री असेल तरच संरचना करा %n%."
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "%S*%N %s [आवृत�ती version %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "खरचं  प�ढे जायचं"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "संस�थापनेत व�यत�यय "
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "पॅकेज संस�थापने प�न�हा बघा"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "होणाऱ��या क�रिया बघा आणि  किंवा अन�क�ल करा"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "काही पॅकेजेस त�टली होती पण ती जोडली आहेत"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "अवलंबित�व प�रश�नावर �कही उत�तर अस�तित�वात नाही."
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7124,7 +7086,7 @@ msgstr ""
 "अवलंबित�वांना संपवण�याचा प�रयत�न वेळेपेक�षा जास�त काळ लागला ( \"%S\" प�रयत�न करण�यासाठी "
 "दाबा)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7132,19 +7094,19 @@ msgstr ""
 "पॅकेजेस संरचित करणे काढून टाकणे याला प�रबंधन परवाणगी असावी लागते, जी आत�ता त�म�हाला प�राप�त "
 "नाही.तूम�हाला र�ट अकाऊंट बदलायचा आहे का?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "र�ट व�हा"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "कट होउ नका"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "क�ठलीही पॅकेजेस संस�थापित करण�यासाठी ठरविलेलं नाही"
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7154,19 +7116,19 @@ msgstr ""
 "आवृत�तीत केली जातील पण, त�म�ही ती तसे करण�यास निवडली नाहीत. प�ढील आवृत�तीत करण�यासाठी "
 "लिहा \"U\""
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "पॅकेज याद�या अपडेट करत आहे."
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "पॅकेज याद�या स�धारित आवृत�तीची प�रगती बघा."
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "स�धारणांची यादी करा"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7174,23 +7136,23 @@ msgstr ""
 "पॅकेज यादी स�धारित करण�यासाठी प�रबंधन परवाणगी असणे आवश�यक आहे, जी त�म�हाला आत�ता प�राप�त "
 "नाही.  त�म�हाला र�ट अकाऊंट बदलायचा आहे का?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "माईन�स�� शोधण�यात वेळ व�यर�थ गेला ."
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "डाऊनलोड होत असताना सफाई करणे परवाणगी प�राप�त नाही."
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "डाउनलोडेड फाईल�स मिटवत आहे."
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "डाउनलोडेड पॅकेज फाईल�स मिटवण�यात आल�या आहेत."
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7199,18 +7161,18 @@ msgstr ""
 "पॅकेज यादी स�धारित करण�यासाठी प�रबंधन परवाणगी असणे आवश�यक आहे, जी त�म�हाला आत�ता प�राप�त "
 "नाही.  त�म�हाला र�ट अकाऊंट बदलायचा आहे का?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "� पी टी अस�थाई स�मृतीकोष फाईल उपलब�ध नाही, आपोआप स�वच�छता करता येत नाही"
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "कालबाह�य डाऊनलोड पॅकेज फाईल�स काढून टाकल�या %SB डिस�क जागा रिकामी �ाली."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7219,133 +7181,133 @@ msgstr ""
 "पॅकेज यादी स�धारित करण�यासाठी प�रबंधन परवाणगी असणे आवश�यक आहे, जी त�म�हाला आत�ता प�राप�त "
 "नाही.  त�म�हाला र�ट अकाऊंट बदलायचा आहे का?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "आणखी उत�तरे नाहीत"
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "अप�लाय करण�यासाठी उत�तर शोधण�यास असमर�थ"
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "उत�तर शोधण�याचा प�रयत�न करताना वेळ निघ�न गेली."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "डिपेंडंसीज  अवलंबित�वे"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "अपूर�ण अवलंबित�वंची उत�तरे शोधा"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr " %LS ला उघडण�यात असमर�थ"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "रि�ाॅल�वर स�थिती पाठवत असताना त�र�टी"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "पॅकेजेस संस�थापन काढून टाका"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "पॅकेज यादी स�धारित आवृत�ती करा"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "अप ग�रेडे�बल चिन�हांकीत करा"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "नवीन पॅकेजेस विसरा"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "कॅन�सल राहीलेल�या क�रिया"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "स�वच�छ पॅकेज अस�थाई स�मृतीकोष."
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "सफाई कालबाह�य फाईल�स"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "प�नःदाखल होणारी पॅकेज अस�थाई स�मृतीकोष"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "माईनस�विपर खेळा."
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "र�ट व�हा"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "बाहेर पडा"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "बदल रद�द करा"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "संस�थापना"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "आत�ता निवड केलेल�या पॅकेजला संस�थापनेसाठी किंवा प�ढिल आवृत�तीत होण�यासाठी स�चित करा."
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "काढून टाका"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "आत�ता निवड केलेल�या पॅकेजला काढून टाकण�यासाठी सूचित करा."
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^स�वच�छ करा"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "  आत�ता निवड केलेल�या पॅकेजला आणि त�याच�या संरचित फाईल�स ना काढून टाकण�यासाठी सूचित करा."
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr " ठेवा."
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr " निवडलेल�या पॅकेजवरिल क�ठलिही क�रिया रद�द करा. "
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "तात�प�रते थांबवा."
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 "निवडलेल�या पॅकेजवरिल क�ठलिही क�रिया रद�द करा आणि भविष�यात असं होण�यापासून त�याला वाचवा."
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "^ ला आपोआप म�हणून चिन�हांकीत करा."
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7353,11 +7315,11 @@ msgstr ""
 "निवड केलेल�या पॅकेजला आपोआप संरचित केलेले म�हणून चिन�हांकित करा.ह�या वर द�सरे कोणतेही पॅकेज "
 "अवलंबून नसेल तर ते आपोआप काढून टाकले जाईल."
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "^मदत चिन�हांकीत"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7365,11 +7327,11 @@ msgstr ""
 " निवड केलेल�या पॅकेजला स�वतः संरचित केलेले म�हणून चिन�हांकित करातूम�ही स�वतः काढून टाकत नाही "
 "तोपर�यंत ते काढून टाकले जाणार नाही."
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "फाॅरबीड आवृृत�ती"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7377,336 +7339,336 @@ msgstr ""
 "निवड केलेल�या पॅकेजची कॅंडीडेट आवृत�ती संरचित केलेले म�हणून फाॅरबीड करा,पॅकेजची नवीन आवृत�ती "
 "नेहमीप�रमाणे संरचित होईल. "
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "आय माहिती"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "निवडलेल�या पॅकेजबद�दल अधिक माहिती दाखवा."
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "चेंजलाॅग"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "निवडलेल�या पॅकेजचे डेबियन चेंजलाॅग दाखवा."
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "उत�तराचे परिक�षण"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "डिपेंडन�सी प�रश�नावर आत�ता निवडलेल�या उत�तराचे परिक�षण करा."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "उत�तर वापरा लावा."
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "आत�ता निवडलेल�या उत�तरावर क�रिया करण�यास स�र�वात करा."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "प�ढील उत�तर"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "डिपेंडन�सी प�रश�नाला प�ढील उत�तर निवडा."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "मागील उत�तर"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "डिपेंडन�सी प�रश�नाला मागील उत�तर निवडा."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "पहिले उत�तर"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "डिपेंडन�सी प�रश�नाला पहिले उत�तर निवडा."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "शेवटचे उत�तर"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "तयार �ालेल�या डिपेंडन�सी प�रश�नाला शेवटचे उत�तर निवडा."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "टाॅगल परतवले नापसंत"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "न�कतीच निवडलेली क�रिया असंमत केली आहे का ते टाॅगल करा."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "टाॅगल संमत"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "टाॅगल, आत�ताच निवडलेली क�रिया संमत �ाली का?"
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "लक�ष�य दाखवा."
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "निवडलेल�या क�रियेने परिणाम केलेली पॅकेजेस दाखवा."
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "शोधा"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "प�ढे बघा."
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "मागे शोधा."
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "मागे बघा"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "बघा प�न�हा"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "मागचा शोध प�न�हा दाखवा."
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 #, fuzzy
 msgid "Find Again ^Backwards"
 msgstr "मागे शोधा."
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 #, fuzzy
 msgid "Repeat the last search in the opposite direction"
 msgstr "मागचा शोध प�न�हा दाखवा."
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "दृष�य सिमीत करा."
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "पॅकेज यादीला गाळणी फिल�टर वापरा."
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "दृष�य असिमीत"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "पॅकेज यादीमधून गाळणी फिल�टर काढून टाका."
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "शोधा त�टके."
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "असमाधानी डिपेंडन�सीजसह प�ढील पॅकेज शोधा."
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 #, fuzzy
 msgid "^Preferences"
 msgstr "पूर�वावलंबित आहे"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "यू आय पर�याय"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "मानवी   वर परिणाम होण�यासाठी    सेटींग (मांडणी) बदला."
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "डिपेंडन�सी हाताळणे"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "पॅकेज डिपेंडन�सीज कसे हाताळावे यासाठी सेटींग (मांडणी) बदलता येतात."
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^संकीर�ण"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "इतर आज�ञावली मांडणी बदला."
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "प�नः पर�याय"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "म�लभूत प�रणालीमध�ये मांडणीची प�र�नमांडणी करा."
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "प�ढे"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "प�ढील दृष�य दाखवा."
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "मागील"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "मागील दृष�य दाखवा."
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "बंद करा"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "हे दृष�य बंद करा"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "नवीन पॅकेज दृष�य"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "नवीन म�लभूत पॅकेज दृष�य तयार करा"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "आॅडिट ^शिफारसी"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr "तूम�हाला सांगितलेली व त�म�ही संरचित केलेली , पण आत�ता संरचित न केलेली पॅकेजेस दाखवा."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "नवीन सरळ पॅकेज यादी"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "प�रणालीत असणाऱ�या सगळ�या पॅकेजेस �का अवर�गीकृत यादीमध�ये दाखवा."
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "नवीन डेबटॅग�ज�� ब�राऊ�र"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "डेबटॅग�ज�� डेटा वापर�न पॅकेजेस ब�राउ� करा वाचा"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "नवीन वर�गीकृत ब�राऊ�र"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "पॅकेजेस वर�गवार वाचा वर�गीकृत करा"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "बद�दल"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "ह�या आज�ञावली प�रोग�राम बद�दलची माहीती दाखवा."
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "मदत"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "आॅन लाईन मदत दाखवा."
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "उपयोजक प�स�तिका"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "आज�ञावली प�स�तिका दाखवा."
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "�फ � क�यू"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "बातम�या"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "प�रत�येक आवृत�तीत केलेले महत�त�वाचे बदल दाखवा."
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^परवाना"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "क�रिया"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "शोध"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "पर�याय"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "दृष�ये"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7715,11 +7677,11 @@ msgstr ""
 "%ls: मेन�  %ls: मदत  %ls: बाहेर  %ls: प�ढील आवृत�तीत  %ls: डाउनलोड / संस�थापन / काढ�न "
 "टाकणे  पॅकेजेस"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "हो की कळं"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "नाही की"
 
@@ -7747,9 +7709,40 @@ msgstr "बदल नोंदी उतरवून घेण�यासाठ
 msgid "Downloading the changelog of %s"
 msgstr "चेंजलाॅग डाऊनलोड होत आहे."
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "त�म�ही फक�त डेबियन पॅकेजेसचे चेंजलाॅग�ज बघू शकाल."
+#~ msgid "MISSING TAG"
+#~ msgstr "MISSING TAG (गहाळ टॅग)"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "बदल नोंदी उतरवून घेण�यासाठी यूआर�ल(URL) वापरावीत"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr "%s हे औपचारिक डेवियन पॅकेज नाही, त�यातील बदलनोंद प�रदर�शित करता येत नाही"
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "\"%s\"नावाचे पॅकेज सापडत नाही"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "%sनम�न�यातील लहान परस�परसंबध (पार�स) दाखवण�यास असमर�थ"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "-q नंतर �क क�रमंाक अपेक�षित आहे.\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "-q नंतर �क क�रमंाक अपेक�षित आहे. %sे मिळाले \n"
+
+#, fuzzy
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr " कळ=मूल�य स�वरूपाचे विधान -O ला हवे आहे,%s मिळाले."
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "गूढता ः अज�ञात पर�याय संकेत मिळाला.\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "आज�ञेसोबत  -u व -i नमूद केले नसेलही "
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "त�म�ही फक�त डेबियन पॅकेजेसचे चेंजलाॅग�ज बघू शकाल."
 
 #~ msgid "Err "
 #~ msgstr "Err"
@@ -7879,11 +7872,6 @@ msgstr "त�म�ही फक�त डेबियन पॅकेजेस
 #~ msgstr "चेंजलाॅग डाऊनलोड होत आहे."
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "क�ठलेही रि�ोल�यूशन सापडले नाही."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "पॅकेज स�तरीय फाइल %s उघडता येत नाही."
diff --git a/po/nb.gmo b/po/nb.gmo
index 19568975..17c2bc36 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 2e310853..5d0ad9cf 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude_nb\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:27+0800\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -368,24 +368,10 @@ msgstr ""
 "fra et arkiv i sources.list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "Nettadresse som changelogs skal hentes fra"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Dette valget kontrollerer malen som brukes for å laste ned endringslogger "
-"fra Debian nettstedet. Du trenger bare endre dette hvis endringsloggene "
-"flyttes til en annen URL."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Forhåndsvis hva som vil bli gjort før det blir gjort"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -393,12 +379,12 @@ msgstr ""
 "Hvis dette valget er aktivert, vil et sammendrag av handlingene som skal "
 "utføres vises når du ber aptitude om å utføre en installeringskjøring."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Glem hvilke pakker som er «nye» når pakkelistene blir oppdatert"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -406,13 +392,13 @@ msgstr ""
 "Hvis dette valget er aktivert, vil aptitude tømme lista over nye pakker "
 "etter at du har oppdatert pakkelistene (ved å trykke «u»)."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Glem hvilke pakker som er «nye» når pakker blir installert eller fjernet"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -422,13 +408,13 @@ msgstr ""
 "etter at du har utført en installeringskjøring eller installert eller "
 "fjernet pakker fra kommandolinja."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "Ikke vis advarsel når den første endringen gjøres i skrivebeskyttet stand"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -438,13 +424,13 @@ msgstr ""
 "endrer tilstanden for en pakke hvis du ikke har rettigheter til å utføre "
 "endringen på systemet."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Gi advarsel når en vanlig bruker prøver å gjøre noe som krever root-"
 "rettigheter"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -456,11 +442,11 @@ msgstr ""
 "installering av pakker når du ikke er root-brukeren. Du får muligheten til å "
 "logge inn som root og utføre handlingen med root-tillatelser."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Fil som handlinger skal loggføres i"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -472,11 +458,11 @@ msgstr ""
 "et rør («%B|%b»), vil resten av filnavnet tolkes som en skallkommando som "
 "skal motta loggen på standard inndata."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Finn pakke-avhengighetene automatisk når en pakke blir valgt"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -488,11 +474,11 @@ msgstr ""
 "installering. Dette er mye raskere enn den innebygde avhengighetsløseren, "
 "men kan gi uoptimale resultat eller feile totalt i enkelte sammenhenger."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "Reparer ødelagte pakker automatisk før andre installeres eller fjernes"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -504,11 +490,11 @@ msgstr ""
 "løsning. Hvis ikke, vil aptitude spørre deg om en løsning for de ødelagte "
 "avhengighetene."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Installer anbefalte pakker automatisk"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -526,11 +512,11 @@ msgstr ""
 "vil pakker som er anbefalt av en installert pakke ikke bli automatisk "
 "slettet."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Fjern ubrukte pakker automatisk"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -547,11 +533,11 @@ msgstr ""
 "samtidig, vil automatisk installerte pakker ikke bli fjernet hvis noen "
 "installerte pakker anbefaler dem."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Pakker som aldri skal fjernes automatisk"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -561,11 +547,11 @@ msgstr ""
 "en installert pakke er avhengig av dem - de vil aldri bli satt til fjerning "
 "som andre ubrukte pakker."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr "Tillat avhengighetsløsninger som ødelegger holdte eller forbudte"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -587,15 +573,15 @@ msgstr ""
 "blitt valgt for installering eller oppgradering, på grunn av apt feil "
 "#470035."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Innstillinger for grensesnittet"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "HÃ¥ndtering av avhengigheter"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Diverse"
 
@@ -699,7 +685,7 @@ msgstr "Klarte ikke finne kildepakken for «%s».\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Klarte ikke tilfredsstille byggeavhengighetene: «%s».\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -708,7 +694,7 @@ msgstr ""
 "Merk: «%s», tilbyr den virtuelle pakken\n"
 "      «%s», er allerede installert.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -717,7 +703,7 @@ msgstr ""
 "Merk: «%s», tilbyr den virtuelle pakken\n"
 "      «%s», står allerede på tur til å bli installert.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -726,17 +712,22 @@ msgstr ""
 "«%s» eksisterer i pakkedatabasen, men det er ingen\n"
 "virkelig pakke og ingen pakker trenger den.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "«%s» er en virtuell pakke som behøves av:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Du må velge en som skal installeres.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Pakken «%s» har ingen installasjonskandidat"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -745,62 +736,55 @@ msgstr ""
 "Merk: Ved å velge «%s» istedenfor\n"
 "      den virtuelle pakken «%s»\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s er allerede installert og er av den ønskede versjonen (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s er ikke installert nå, så den blir ikke re-installert.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s er allerede installert og er av den ønskede versjonen (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s er ikke installert nå, så den blir ikke re-installert.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Pakke %s er ikke installert, så den blir ikke fjernet\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pakke %s er ikke installert, kan ikke forby oppgradering\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Pakke %s kan ikke oppgraderes, kan ikke forby oppgradering\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Merk: Velg oppgaven «%s: %s» for installasjon\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Du kan bare oppgi en pakkeversjon med en «install»-kommando eller en «forby-"
-"versjon»-kommando.\n"
+"versjon»-kommando"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Du kan bare oppgi et pakkearkiv med en «install»-kommando.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Du kan bare oppgi et pakkearkiv med en «install»-kommando"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -809,7 +793,7 @@ msgstr ""
 "Klarte ikke å finne pakken «%s», og mer enn 40\n"
 "pakker har «%s» i navnet.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -818,13 +802,13 @@ msgstr ""
 "Klarte ikke å finne pakken «%s». Men disse pakkene\n"
 "har «%s» i navnet:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Fant ingen pakke med et navn eller en beskrivelse som passer med «%s»\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -842,7 +826,7 @@ msgstr ""
 "Fant ingen pakke som passer med «%s». Men disse pakkene\n"
 "har «%s» i beskrivelsen:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Feil handlingstegn «%c»\n"
@@ -865,101 +849,84 @@ msgstr "Feil "
 msgid "Changelog download failed: %s"
 msgstr "Endringslogg for %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Kan ikke kjøre sensible-pager, er dette et fungerende Debian-system?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s er ikke en offisiell Debian-pakke, dens endringslogg kan ikke vises."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Klatre ikke finne en endringslogg for %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "Klatre ikke finne en endringslogg for %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: Kommandoen clean tar ingen argument\n"
+msgid "The clean command takes no arguments"
+msgstr "Kommandoen clean tar ingen argument"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Slett %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikke slå opp din hjemmemappe, lagrer til /tmp/function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Slett %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: Kommandoen autoclean tar ingen argument\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Kommandoen autoclean tar ingen argument"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Vil frigjøre %sB av plassen på harddisken\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Frigjorde %sB av plassen på harddisken\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ugyldig operasjon %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Uventet mønsterargument etter «behold-alle»"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
-"Klarte ikke løse opp avhengigheter sikkert, prøv å kjøre med --full-"
-"resolver.\n"
+"Klarte ikke løse opp avhengigheter sikkert, prøv å kjøre med --full-resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Avbryt.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "nedlasting: Du må oppgi minst en pakke som skal lastes ned\n"
+msgid "download: you must specify at least one package to download"
+msgstr "nedlasting: Du må oppgi minst en pakke som skal lastes ned"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Klarte ikke å lese kildelista"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Fant ingen pakke kalt «%s»"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -999,22 +966,14 @@ msgid "[Working]"
 msgstr " [Arbeider]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: minst et argument er nødvendig, \n"
-"mappa filene skal skrives til.\n"
+"extract-cache-entries: minst et argument er nødvendig, mappa filene skal "
+"skrives til"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Pakke «%s» finnes ikke"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
@@ -1022,11 +981,10 @@ msgstr ""
 "gjøre.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: Kommandoen forget-new tar ingen argument\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Kommandoen forget-new tar ingen argument"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Vil glemme hvilke pakker som er nye\n"
@@ -1136,17 +1094,17 @@ msgstr "Disse pakkene vil bli oppgradert:"
 msgid "The following partially installed packages will be configured:"
 msgstr "De følgende delvis installerte pakkene vil bli satt opp:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Disse VIKTIGE pakkene vil bli FJERNET!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Disse VIKTIGE pakkene vil bli ØDELAGT med denne handlingen:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1156,16 +1114,16 @@ msgstr ""
 "ødelagt!\n"
 "          IKKE fortsett dersom du ikke vet NØYAKTIG hva du gjør!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Jeg er klar over at dette er en svært dårlig ide"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "For å fortsette, skriv inn teksten «%s»:\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1182,7 +1140,7 @@ msgstr ""
 "at det er det du vil gjøre.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1191,7 +1149,7 @@ msgstr ""
 "*** ADVARSEL ***  Ignorerer disse tillitsbruddene fordi \n"
 "                  %s::CmdLine::Ignore-Trust-Violations er «true»!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1204,7 +1162,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1213,96 +1171,96 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Vil du overse denne advarselen og fortsette likevel?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "For å fortsette, skriv «%s», for å avbryte, skriv «%s»: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Ikke forstått. Skriv enten «%s» eller «%s».\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Disse pakkene er ANBEFALT men blir IKKE installert:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Disse pakkene er FORESLÃ…TT men blir IKKE installert:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Ingen pakker vil bli installert, oppgradert eller fjernet.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pakker oppgradert, %lu nylig installert, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installert på nytt, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu skal fjernes og %lu skal ikke oppgraderes.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Trenger å hente %sB/%sB i installasjonspakker. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Trenger å hente %sB i installasjonspakker. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Etter utpakking vil %sB bli brukt.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Etter utpakking vil %sB bli frigjort.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Ingen pakker å vise -- oppgi pakkenavnene på linja etter «i».\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Trykk Enter for å fortsette."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Ingen pakker funnet -- oppgi pakkenavnene på linja etter «c».\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1311,42 +1269,42 @@ msgstr ""
 "Ingen pakker funnet -- skriv inn null eller flere røtter for søket fulgt av "
 "pakken for å justere.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "fortsett med installasjonen"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "avbryt og stopp"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr ""
 "vis opplysninger om en eller flere pakker, pakkenavnene må oppgis etter 'i'"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1354,39 +1312,39 @@ msgstr ""
 "Vis Debian endringslogger for en eller flere pakker, pakkenavnene må oppgis "
 "etter 'c'"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "Slå av eller på visning av avhengighetsinformasjon"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "Slå av eller på visning av endringer i pakkestørrelse"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "Slå av eller på visning av versjonsnumre"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1395,26 +1353,26 @@ msgstr ""
 "hvorfor installering av en pakke skal føre til at en annen pakke blir "
 "installert."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "kjør den automatisk avhengighetsløseren for å fikse ødelagte avhengigheter."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "start fullt visuelt grensesnitt"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1426,46 +1384,46 @@ msgstr ""
 "mønstre). Handlingen vil bli utført for alle pakker du oppgir. Følgende "
 "handlinger kan utføres:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "«+» for å installere pakker"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "«+M» for å installere pakker og straks merke dem som installert automatisk"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' for å slette pakker"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' for å fjerne pakker fra systemet"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' for å holde pakker tilbake"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':' for å holde pakker i nåværende status uten å holde dem tilbake"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr " '&M' for å merke pakker som automatisk installert"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr " '&m' for å merke pakker som manuelt installert"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "«&BD» for å installere byggeavhengighetene for en pakke."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1473,29 +1431,29 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr " '&M' for å merke pakker som automatisk installert"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Kommandoer:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1503,19 +1461,19 @@ msgstr ""
 "aptitude klarte ikke finne en løsning for disse avhengighetene. Du kan løse "
 "dem selv for hånd eller skrive «n» for å avslutte."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Vil du fortsette? [Y/n/?]"
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Løs disse avhengighetene for hånd? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Ugyldig respons. Skriv inn en gyldig kommando eller «?» for hjelp.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1524,7 +1482,7 @@ msgstr ""
 "pakke), «R» for å prøve automatisk løsning av avhengigheter eller «N» for å "
 "avbryte."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1535,7 +1493,7 @@ msgstr ""
 "Viser informasjon om avhengigheter.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1546,7 +1504,7 @@ msgstr ""
 "Viser ikke informasjon om avhengigheter.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1557,7 +1515,7 @@ msgstr ""
 "Versjoner vil bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1568,7 +1526,7 @@ msgstr ""
 "Versjoner vil ikke bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1579,7 +1537,7 @@ msgstr ""
 "Størrelsesendringer vil bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1713,6 +1671,11 @@ msgstr "Ventet minst ett pakke/versjon-par etter «%c»"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Forventet en versjon eller «%s» etter «%s»"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Pakke «%s» finnes ikke"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1862,7 +1825,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 "Jeg ønsker å løse avhengighetene, men ingen avhengighetsløser ble opprettet."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1891,7 +1854,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Følgende kommandoer er tilgjengelige:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Fil som løsningsstatus skal skrives til: "
 
@@ -1923,7 +1886,7 @@ msgstr ""
 "*** ERROR: Søk avbrutt av kritisk unntak. Du kan fortsette\n"
 "           å søke, men noen løsninger vil være umulig å nå."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1932,26 +1895,25 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Klarte ikke løse opp avhengigheter for oppgraderingen (ingen løsning funnet)."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Klarte ikke å løse opp avhengigheter for oppgraderingen (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "iconv av %s mislyktes.\n"
+msgid "iconv of %s failed"
+msgstr "iconv av %s mislyktes"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "søk: Du må oppgi minst ett søkeord\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "søk: Du må oppgi minst ett søkeord"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1994,7 +1956,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Disse pakkene hadde utilfredsstilte avhengigheter:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2217,7 +2179,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Skaffer"
 
@@ -2231,15 +2193,9 @@ msgstr "Beskrivelse: "
 msgid "Homepage: "
 msgstr "Hjemmeside: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Klarte ikke å finne pakka %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Klarte ikke å tolke mønsteret %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Fant ingen pakker"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2250,14 +2206,13 @@ msgstr "Vil laste ned, installere og/eller fjerne pakker.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Intern feil, bestillingen ble ikke ferdig"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Sletter nedlastede filer som er foreldet"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: Kommandoen update tar ingen argument\n"
+msgid "The update command takes no arguments"
+msgstr "Kommandoen update tar ingen argument"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2274,132 +2229,154 @@ msgstr "Fjerner brukermerke «%s» fra pakken «%s».\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr "%s: for få argument; forventer minst et merkenavn og en pakke.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Ingen kandidatversjon funnet for %s\n"
+msgid "No candidate version found for %s"
+msgstr "Ingen kandidatversjon funnet for %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Ingen nåværende eller kandidatversjon funnet for %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "Ingen nåværende eller kandidatversjon funnet for %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Klarte ikke å finne et arkiv «%s» for pakken «%s»\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Klarte ikke å finne et arkiv «%s» for pakken «%s»"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Klarte ikke finne noen versjon «%s» for pakken «%s»\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Klarte ikke finne noen versjon «%s» for pakken «%s»"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Intern feil: ugyldig verdi %i ble sendt til cmdline_find_ver.\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Intern feil: ugyldig verdi %i ble sendt til cmdline_find_ver"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Du kan ikke oppgi både et arkiv og en versjon for en pakke\n"
-
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Klatre ikke finne en endringslogg for %s"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Du kan ikke oppgi både et arkiv og en versjon for en pakke"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d ødelagt [%+d]"
 msgstr[1] "%d ødelagte [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d oppdatering [%+d]"
 msgstr[1] "%d oppdateringer [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d ny [%+d]"
 msgstr[1] "%d nye [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Gjeldende status: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "Det er %d nylig foreldet pakke."
 msgstr[1] "Det er %d nylig foreldete pakker."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "Det er %d nylig foreldet pakke: "
 msgstr[1] "Det er %d nylig foreldete pakker: "
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Ikke noe komma etter merkenavn «%s»"
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Klarte ikke å finne pakka %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Klatre ikke finne en endringslogg for %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Merk: Velg oppgaven «%s: %s» for installasjon\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Klatre ikke finne en endringslogg for %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Pakker"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Kildepakke: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "Arkiv"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "søk: Du må oppgi minst ett søkeord\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2422,7 +2399,7 @@ msgstr "Nåværende"
 msgid "Candidate"
 msgstr "Kandidat"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Installer"
 
@@ -2526,22 +2503,19 @@ msgstr "Klarte ikke finne en grunn til å installere %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Pakker som er avhengige av %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Ingen pakke kalt «%s» eksisterer."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Klarte ikke å tolke noen treffmønster."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
-msgstr ""
-"%s: Denne kommando krever minst ett argument (pakken som skal spørres).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
+msgstr "%s: Denne kommando krever minst ett argument (pakken som skal spørres)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2567,11 +2541,11 @@ msgstr "IKKE OPPFYLT"
 msgid "UNAVAILABLE"
 msgstr "UTILGJENGELIG"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Merker"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Brukermerker"
 
@@ -2773,32 +2747,32 @@ msgstr ""
 "annet apt verktøy allerede installerer pakker. Åpner skrivebeskyttet; "
 "endringer du gjør i pakkenes tilstand blir IKKE beholdt!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 msgid "allowed"
 msgstr "tillat_valg"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "hoved"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2865,37 +2839,45 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "Pakkemellomlageret er ikke tilgjengelig, klarte ikke laste ned og installere "
 "pakker."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 "Intern feil: klarte ikke å lage en liste over pakker som skal lastes ned"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Klarte ikke å hente %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Klarte ikke å hente alle arkivene. Du kan prøve med «aptitude update» eller "
+"«--fix-missing»."
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Ikke i stand til å korrigere for utilgjengelige pakker"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Det lyktes ikke å installere en pakke. Prøver å gjenopprette:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3046,13 +3028,13 @@ msgstr ""
 "\n"
 "Logg ferdig.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "Laster ned pakker"
@@ -3164,18 +3146,18 @@ msgid ""
 msgstr ""
 "Pakkeindeksfilene er ødelagte. Feltet «Filename:» mangler for pakken %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Endringslogg for %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "Nettadresse som changelogs skal hentes fra"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Nettadresse som changelogs skal hentes fra"
@@ -3225,26 +3207,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Klarte ikke å tolke mønsteret %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Bygger merke-databasen"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "Ikke installert"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "Ikke installert"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3392,41 +3375,41 @@ msgstr ""
 msgid "_File"
 msgstr "Usann"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Utfør alle utestående installeringer og slettinger"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Se etter nye versjoner av pakkene"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Marker alle oppgraderbare pakker som ikke holdes tilbake"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Glem hvilke pakker som er «nye»"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Kanseller alle utestående installeringer, slettinger holdinger og "
 "oppgraderinger."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Slett alle pakkefiler som ble lastet ned tidligere"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Slett pakkefiler som ikke lenger kan lastes ned"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Last mellomlageret for pakker på nytt"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3436,7 +3419,7 @@ msgstr ""
 "Kjør «su» for å bli root.  Dette vil starte programmet på nytt, men "
 "innstillingene blir bevart"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Avslutt programmet"
 
@@ -3444,7 +3427,7 @@ msgstr "Avslutt programmet"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Angre den siste pakkeoperasjonen eller en gruppe operasjoner"
 
@@ -3478,7 +3461,7 @@ msgid "_Help"
 msgstr "Hjelp"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3487,19 +3470,19 @@ msgstr ""
 msgid "Update"
 msgstr "Listeoppdatering"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Pakker"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Løsningsfinner"
 
@@ -3686,7 +3669,7 @@ msgid "Fix Manually"
 msgstr "HÃ¥ndbok"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Oppgrader"
 
@@ -4221,11 +4204,11 @@ msgstr "installertI"
 msgid "Reinstall"
 msgstr "Installer på nytt"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Nedgrader"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Fjern"
 
@@ -4261,7 +4244,7 @@ msgstr "Bruk et filter på pakkelista"
 msgid "Download already running."
 msgstr "Laster ned ..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Det foregår allerede en oppdatering av pakkelistene eller en installasjon."
@@ -4323,38 +4306,38 @@ msgstr "Ingen ødelagte pakker."
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Klarte ikke å bytte ut %s med ny oppsettsfil"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Laster ned pakker"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "Ingen ødelagte pakker."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "Ingen ødelagte pakker."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "Løs opp avhengigheter"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Ingen pakker er skadet."
 msgstr[1] "Ingen pakker er skadet."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s endringer"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s endringer"
@@ -4362,7 +4345,7 @@ msgstr "%s endringer"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4372,64 +4355,64 @@ msgstr[1] "%d installert"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "klarte ikke å fjerne %s"
 msgstr[1] "klarte ikke å fjerne %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "NedlastingsStr"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "ikke installert"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "installertI"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "^Slett helt"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Behold"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Hold"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "Brukerhåndbok"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4469,7 +4452,7 @@ msgstr "ingen"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4514,17 +4497,17 @@ msgstr "%s, vil bli installert automatisk"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "Søk"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "Bygger visning"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Bygger visning"
@@ -5224,108 +5207,109 @@ msgstr "Ukjent oppstillingstype «%s»"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Metoden for sortering etter navn tar ingen argument"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Ugyldig nullengdenavn på sorteringsmetoden"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Manglende sluttparentes i beskrivelsen av sorteringsmetode"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Som sorteringsmåte er «%s» ugyldig"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Kan ikke avkode flerbyte-streng etter «%ls»"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Kan ikke avkode bredtegnsstreng etter «%s»"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s kompilert på %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompilator: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Kompilert med:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt versjon %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  NCurses-versjon: Ukjent\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  NCurses-versjon %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++-versjon: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Ept-støtte aktivert.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Ept-støtte deaktivert.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt versjon %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt versjon %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Ept-støtte deaktivert.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s kompilert på %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Ept-støtte deaktivert.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5333,32 +5317,32 @@ msgstr ""
 "\n"
 "Nåværende bibliotekversjoner:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  NCurses-versjon: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  cwidget-versjon: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Apt-versjon: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Bruk: aptitude [-S fnavn] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [valg] <handling> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5368,42 +5352,42 @@ msgstr ""
 "modus):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Installer/oppgrader pakker.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Fjerner pakker.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Fjerner pakker og oppsettsfilene deres.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Beholder pakkevalget.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Fjern en hold-kommando for en pakke.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Merk pakker som automatisk installert.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Merk pakker som manuelt installert.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5411,17 +5395,17 @@ msgid ""
 msgstr ""
 " forbid-version - Forby aptitude å oppgradere til en bestemt pakkeversjon.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Last ned listene over nye/oppgraderbare pakker.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Utfør en trygg oppgradering.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5430,52 +5414,52 @@ msgstr ""
 " full-upgrade - Utfør en oppgradering, det kan være pakker blir installert "
 "og fjernet.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "«&BD» for å installere byggeavhengighetene for en pakke."
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Glem hvilke pakker som er «nye».\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Søk etter en pakke utifra navn og/eller uttrykk.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Vis detaljert informasjon om en pakke.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Vis detaljert informasjon om en pakke\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Slett nedlastede pakkefiler.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Slett eldre nedlastede pakkefiler.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Vis en pakkes endringslogg.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Les ned .deb-fila til en pakke.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5484,7 +5468,7 @@ msgstr ""
 " reinstall    - Last ned og (kanskje) installer omigjen en pakke som nå er "
 "installert.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5496,7 +5480,7 @@ msgstr ""
 "                hvorfor en eller flere pakker ville krever den gitte "
 "pakken.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5510,63 +5494,63 @@ msgstr ""
 "ville\n"
 "                lede til en konflikt med den gitte pakken hvis installert.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Valg:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Denne hjelpeteksten.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Denne hjelpeteksten\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simuler handlinger, men ikke utfør dem.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Bare last ned pakker, ikke installer eller slett noe.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Spør alltid om bekreftelse eller handlinger.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
 " -y             Forutsett at svaret på enkle ja/nei-spørsmål er «Ja».\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5574,7 +5558,7 @@ msgid ""
 msgstr ""
 " -F format      Oppgi et format for visning av søkeresultatet; se manualen.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5582,50 +5566,50 @@ msgid ""
 msgstr ""
 " -O rekkefølge  Oppgir hvordan et søkeresultat skal sorteres; se manualen.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr ""
 " -w bredde     Oppgi visningsbredde for formatering av søkeresultatet.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Prøv hardt å reparere ødelagte pakker.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Vis hvilke versjoner av pakkene som skal installeres.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             Vis pakkekrava til automatisk endrede pakker.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Vis endringene på installert størrelse på hver pakke.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
 msgstr " -v             Vis ekstra informasjon. (kan tilføyes flere ganger).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 " -t [slippversjon]  Angi hvilken versjon pakker skal installeres fra.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5633,12 +5617,12 @@ msgid ""
 msgstr ""
 " -q             Ved bruk av kommandolinja, ikke vis framdriftsindikatorer.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o nøkkel=verdi  Sett direkte oppsettsvalget «nøkkel».\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5647,159 +5631,139 @@ msgstr ""
 " --with(out)-recommends\t Oppgi om anbefalte pakker skal håndteres\n"
 "                som strenge avhengigheter.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S fnavn: Les den utvidede statusinfo-fila for aptitude fra fnavn.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Last ned ny pakkeliste ved oppstart.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             Denne hjelpeteksten\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Utfør en installasjonskjøring ved oppstart.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Denne aptituden har ikke superku-krefter.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 msgid "trace"
 msgstr "sann"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 msgid "info"
 msgstr "ingen"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 msgid "error"
 msgstr "Feil "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "usann"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Ugyldig operasjon %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Forventet et tall etter -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Forventet et tall etter -q=, fikk %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o krever et argument av formen nøkkel=verdi, fikk %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Ikke noe komma etter merkenavn «%s».\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "MERKELIG: mottok en ukjent valgkode\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "Pakke"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "Alle pakkene"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5807,36 +5771,31 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Du kan bare oppgi enten -u eller -i\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr "-u og -i kan ikke oppgis i kommandolinjemodus (f.eks., med «install»)"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u og -i kan ikke oppgis med en kommando"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Ukjent kommando «%s»\n"
+msgid "Unknown command \"%s\""
+msgstr "Ukjent kommando «%s»"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Unntakssignal ble ikke fanget opp: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5854,7 +5813,7 @@ msgstr "Søk etter: "
 msgid "Search backwards for: "
 msgstr "Søk bakover etter: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Minesveiper"
 
@@ -6065,7 +6024,7 @@ msgstr "Tegnkoding i mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 14 30 17 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Pakke"
 
@@ -6146,8 +6105,8 @@ msgstr "<I/T>"
 msgid "<none>"
 msgstr "<ingen>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtuell"
@@ -6281,7 +6240,7 @@ msgstr "Klarte ikke konvertere pakkevisningsformatet etter «%ls»"
 msgid "Internal error: Default column string is unparsable"
 msgstr "Intern feil: Standard kolonnestreng er uleselig"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Oppgaver"
 
@@ -6438,11 +6397,11 @@ msgstr "Treffindekser må være 1 eller større, ikke «%s»"
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "Treffindeks %ls er for stor, tilgjengelige grupper er (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "MERKELØSE PAKKER"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6452,10 +6411,6 @@ msgstr ""
 "Disse pakkene er ikke klassifisert i debtags eller så er ikke debtags-"
 "databasen tilstede (installasjon av debtags kan løse dette problemet)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "MANGLENDE MERKE"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Kildepakke: "
@@ -7076,7 +7031,7 @@ msgstr "Laster mellomlageret"
 msgid "Really quit Aptitude?"
 msgstr "Sikkert at du vil avslutte aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Endre oppførselen til aptitude"
 
@@ -7158,7 +7113,7 @@ msgstr ""
 msgid "License"
 msgstr "Lisens"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Vis under hvilke betingelser du kan kopiere og distribuere aptitude"
 
@@ -7179,7 +7134,7 @@ msgstr "Hjelp på nettet"
 msgid "View a brief introduction to aptitude"
 msgstr "Vis en kort introduksjon til aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Hjelp"
 
@@ -7208,7 +7163,7 @@ msgstr "HÃ¥ndbok"
 msgid "FAQ"
 msgstr "OSS"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Vis en liste over Ofte Spurte Spørsmål"
 
@@ -7250,15 +7205,15 @@ msgstr ""
 "denne katalogen og hele dens innhold? Hvis du velger «Nei» får du ikke se "
 "denne meldingen igjen."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Vis framgangen i pakkenedlasting"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Pakkenedlasting "
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7270,35 +7225,35 @@ msgstr ""
 "bør bare fortsette installasjonen om du er helt sikker på at det er det du "
 "vil gjøre.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versjon %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Er du sikker på at du vil fortsette"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Avbryt installasjonen"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Forhåndsvisning av pakkeinstallasjonen"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Vis og/eller juster handlingene som vil bli utført"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Noen pakker var skadet og har blitt reparert:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Det finnes ingen løsning på disse avhengighetsproblemene!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7307,7 +7262,7 @@ msgstr ""
 "Slapp opp for tid under forsøk på å løse opp avhengigheter (trykk «%s» for å "
 "arbeide videre)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7315,19 +7270,19 @@ msgstr ""
 "Ã… installere eller fjerne pakker krever at du er logget inn som root, noe du "
 "ikke er. Vil du logge deg inn som root nå?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Bli root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Ikke bli root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ingen pakker vil bli installert, oppgradert eller fjernet."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7337,19 +7292,19 @@ msgstr ""
 "oppgraderes, men du har ikke valgt at de skulle oppgraderes. Tast «U» for å "
 "forberede oppgradering."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Oppdater pakkelistene"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Vis framgangen i oppdatering av pakkelista"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Listeoppdatering"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7357,23 +7312,23 @@ msgstr ""
 "Ã… oppdatere pakkelistene krever at du er logget inn som root, noe du ikke "
 "er. Vil du logge deg inn som root nå?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Kast bort tid på å finne miner"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Du kan ikke slette nedlastede filer mens nedlasting foregår"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Sletter nedlastede filer"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Nedlastede filer er slettet"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7382,11 +7337,11 @@ msgstr ""
 "Ã… oppdatere pakkelistene krever at du er logget inn som root, noe du ikke "
 "er. Vil du logge deg inn som root nå?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "Pakkemellomlageret er ikke tilgjengelig, kan ikke auto-rydde."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7395,7 +7350,7 @@ msgstr ""
 "Foreldede, nedlastede pakkefiler er blitt slettet, det frigjorde %sB "
 "diskplass."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7404,121 +7359,121 @@ msgstr ""
 "Ã… oppdatere pakkelistene krever at du er logget inn som root, noe du ikke "
 "er. Vil du logge deg inn som root nå?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Ingen flere løsninger."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Klarte ikke finne en løsning som skal brukes."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Tidsgrensen utløp under forsøk på å finne en løsning."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Løs opp avhengigheter"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Søk etter løsninger på utilfredsstilte avhengigheter"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Klarte ikke å åpne %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Feil under dumping av løsermotorens tilstand"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^installer/slett pakker"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Oppdater pakkelista"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Marker opp^graderbare"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Glem nye pakker"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Kans^eller utestående handlinger"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Slett mellomlageret for pakker"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Fjern ^foreldede filer"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Last pakkelageret på nytt"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Spill minesveiper"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^Bli root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Avslutt"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Angre"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Installer"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Merk den valgte pakken for installasjon eller oppgradering"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Fjern"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Merk den valgte pakken for fjerning"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Slett helt"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Merk den valgte pakken og dens oppsettsfiler for fjerning"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Behold"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Opphev alle handlinger med den valgte pakken"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Hold"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7526,11 +7481,11 @@ msgstr ""
 "Opphev alle handlinger med den valgte pakken og beskytt den mot senere "
 "oppgradering"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Merk ^Auto"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7538,11 +7493,11 @@ msgstr ""
 "Merk den valgte pakka som automatisk installert, den blir automatisk fjernet "
 "hvis ingen andre pakker avhenger av den"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Merk ^Manuell"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7550,11 +7505,11 @@ msgstr ""
 "Merk den valgte pakka som manuelt installert, den blir ikke fjernet hvis du "
 "ikke fjerner den manuelt"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Forby versjon"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7562,19 +7517,19 @@ msgstr ""
 "Forby installasjon av kandidatversjonen av den valgte pakka, nyere versjoner "
 "av pakka vil bli installert som vanlig"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformasjon"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Vis mer informasjon om den valgte pakka"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "Sir^kuler pakkeinformasjon"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7584,59 +7539,59 @@ msgstr ""
 "lange beskrivelse, en oppsummering av pakkens avhengighetsstatus eller en "
 "analysis av hvorfor pakken er nødvendig."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Endringslogg"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Vis Debians endringslogg for den valgte pakka"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Undersøk løsning"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Undersøk den valgte løsningen på avhengighetsproblemene."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Bruk lø^sning"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Utfør de handlingene som er inneholdt i den løsningen som nå er valgt."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Neste løsning"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Velg den neste løsningen på avhengighetsproblemene."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "F^orrige løsning"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Velg den forrige løsningen på avhengighetsproblemene."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^Første løsning"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Velg den første løsningen på avhengighetsproblemene."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "^Siste løsning"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7644,35 +7599,35 @@ msgstr ""
 "Velg den siste løsningen på avhengighetsproblemene som er blitt generert "
 "hittil."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Slå av/på ^Avvist"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Slå av eller på avvisning av den valgte handlingen."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Slå av/på ^Godkjent"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Slå av eller på godkjennelse av den valgte handlingen."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Vis mål"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Vis den pakka som blir påvirket av den valgte handlingen"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Avvis ødelegging av ^holdte"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7680,136 +7635,136 @@ msgstr ""
 "Avvis alle handlinger som vil endre tilstanden til holdte pakker eller "
 "installere forbudte versjoner"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Finn"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Søk forover"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "^Finn bakover"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Søk bakover"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Finn ^igjen"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Gjenta siste søk"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Finn igjen ^bakover"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Gjenta siste søk i motsatt retning"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "Be^grens visning"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Bruk et filter på pakkelista"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Ubegrenset visning"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Fjern filtrering av pakkelista"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Finn ^Ødelagt"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Finn neste pakke med utilfredsstilte avhengigheter"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Innstillinger"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^Innstillinger av grensesnittet"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Gjør om på innstillingene som berører grensesnittet"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^HÃ¥ndtering av avhengigheter"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Gjør om på innstillingene som berører hvordan pakkeavhengigheter behandles"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Annet"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Gjør endringer i andre programinnstillinger"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Slett valgene"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Gjenopprett standardinnstillingene"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Neste"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Vis neste skjermbilde"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Forr"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Vis forrige skjermbilde"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Lukk"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Lukk dette skjermbildet"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Ny pakke^visning"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Lag en ny standard pakkevisning"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Revider ^Anbefalinger"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7817,87 +7772,87 @@ msgstr ""
 "Vis pakker som er er anbefalt for installasjon, men som nå ikke er "
 "installerte."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Ny ^flat pakkeliste"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Vis alle pakker på systemet i en enkelt ukategorisert liste"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Ny ^Debtags-visning"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Bla i pakker ved bruk av Debtags-data"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Ny visning etter ^kategori"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Vis pakker etter pakketype"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Om"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Vis informasjon om dette programmet"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Hjelp"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Vis hjelpen"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "Bruker^håndbok"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Vis en detaljert brukerhåndbok"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^OSS"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Nyheter"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Vis de viktige endringer som er blitt gjort i hver versjon av "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Lisens"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Handlinger"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Søk"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Valg"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Visninger"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7906,11 +7861,11 @@ msgstr ""
 "%ls: Meny  %ls: Hjelp  %ls: Avslutt  %ls: Oppdater  %ls: Last ned/installer/"
 "slett pakker"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "j"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -7938,9 +7893,49 @@ msgstr "Nettadresse som changelogs skal hentes fra"
 msgid "Downloading the changelog of %s"
 msgstr "Laster ned endringslogg"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Du kan bare se på endringslogger til offisielle Debian-pakker."
+#~ msgid "MISSING TAG"
+#~ msgstr "MANGLENDE MERKE"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "Nettadresse som changelogs skal hentes fra"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Dette valget kontrollerer malen som brukes for å laste ned endringslogger "
+#~ "fra Debian nettstedet. Du trenger bare endre dette hvis endringsloggene "
+#~ "flyttes til en annen URL."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s er ikke en offisiell Debian-pakke, dens endringslogg kan ikke vises."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Fant ingen pakke kalt «%s»"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Klarte ikke å tolke mønsteret %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Forventet et tall etter -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Forventet et tall etter -q=, fikk %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o krever et argument av formen nøkkel=verdi, fikk %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "MERKELIG: mottok en ukjent valgkode\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u og -i kan ikke oppgis med en kommando"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Du kan bare se på endringslogger til offisielle Debian-pakker."
 
 #~ msgid "Err "
 #~ msgstr "Feil "
@@ -8113,11 +8108,6 @@ msgstr "Du kan bare se på endringslogger til offisielle Debian-pakker."
 #~ msgstr "Laster ned endringslogg"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Fant ingen løsning."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Kan ikke åpne pakkehierarkifila %s"
diff --git a/po/ne.gmo b/po/ne.gmo
index f35fe290..450647b8 100644
--- a/po/ne.gmo
+++ b/po/ne.gmo
diff --git a/po/ne.po b/po/ne.po
index 14250752..05f9352d 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude_po_ne\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:27+0800\n"
 "Last-Translator: Nabin Gautam <nabin@mpp.org.np>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -313,68 +313,57 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "परिवर�तन लगहरू डाउनलोड गर�न URL प�रयोग गर�न�होस�"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "यो गर�न� अघि गरिने पूर�ववलोकन प�रदर�शन गर�न�होस�"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "जहिलेपनि प�याकेज सूचिहरू अपडेट भ�को बेला \"new\" प�याकेजहरू बिर�सन�होस�"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "जहिलेपनि प�याकेजहरू स�थापना वा हटाइ�को बेला \"new\" प�याकेजहरू बिर�सन�होस�"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "पढ�ने-मात�र मोडमा पहिलो परिवर�नत बनिरहेको बेला चेतावनी प�रदर�शन नगर�न�होस� "
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "म�ल प�रयोगकर�ता नभ�को प�रयोगकर�ताको र�पमा विशेषधिकार कार�य सम�पादन गर�ने कोसिस गरमा "
 "चेतावनी दिन�होस� "
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -382,11 +371,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "भित�र कार�यहरू लग गर�ने फाइल"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -394,11 +383,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "जब प�याकेज चयन ह�न�छ यसको निर�भरताहर� स�वत: हल ह�न�छ"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -406,11 +395,11 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "स�थापना गर�न वा हटाउन अघि प�याकेजहर�को विच�छेदन स�वत: निश�चित ह�न�छ  "
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -418,12 +407,12 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 #, fuzzy
 msgid "Install recommended packages automatically"
 msgstr "सिफारिस भ�को प�याकेजहरू स�वत: स�थापना गर�न�होस�"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -434,11 +423,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "प�रयोग नभ�को प�याकेजहरू स�वत: हटाउन�होस�"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -449,22 +438,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -477,17 +466,17 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 #, fuzzy
 msgid "UI options"
 msgstr "^UI विकल�पहरू"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 #, fuzzy
 msgid "Dependency handling"
 msgstr "^निर�भरता ह�यान�डलिङ�"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "विविध"
 
@@ -592,7 +581,7 @@ msgstr "पà¥�याकेज \"%s\" को लागि à¤�उटा संगà
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "फाइलहर�मा \"%s\" सूचीबद�ध असक�षम"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -601,7 +590,7 @@ msgstr ""
 "द�रष�टब�य: \"%s\", अवास�तविक प�याकेज उपलब�ध गराउने\n"
 "      \"%s\", पहिल�यै स�थापना भयो ।\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -610,7 +599,7 @@ msgstr ""
 "द�रष�टब�य: \"%s\", अवास�तविक प�याकेज उपलब�ध गराउने\n"
 "      \"%s\", पहिल�यै स�थापना ह�न गइरहेको छ ।\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -619,17 +608,23 @@ msgstr ""
 "\"%s\" प�याकेज डेटाबेसमा अवस�थित छ, तर यो वास�तविक प�याकेज होइन र\n"
 " यसलाई क�नै प�याकेजहरू उपलब�ध छैन ।\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" द�वारा उपलब�ध गराइ�को अवास�तविक प�याकेज हो:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "स�थापना गर�न तपाई�ले �उटा रो�।न� पर�छ ।\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "प�याकेज %s स�थापना भ�न, �उटा स�तरवृद�धि गर�न रोक�न सक�दैन\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -638,62 +633,55 @@ msgstr ""
 "द�रष�टब�य: अवास�तविक प�याकेज \"%s\" को सट�टा\n"
 "      \"%s\" चयन गरिदैछ\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s अन�रोध गरि�को संस�करण (%s) मा पहिल�यै स�थापना भयो\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s हालै स�थापना गरि�को होइन, त�यसैले यो प�न: स�थापना ह�ने छैन ।\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s अन�रोध गरि�को संस�करण (%s) मा पहिल�यै स�थापना भयो\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s हालै स�थापना गरि�को होइन, त�यसैले यो प�न: स�थापना ह�ने छैन ।\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "प�याकेज %s स�थापना भ�न, त�यसैले यो हटाउन सकिदैन\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "प�याकेज %s स�थापना भ�न, �उटा स�तरवृद�धि गर�न रोक�न सक�दैन\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "प�याकेज %s स�तरवृद�धियोग�य छैन, �उटा स�तरवृद�धि गर�न रोक�न सक�दैन\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "द�रष�टब�य: स�थापनाको लागि कार�य \"%s: %s\" चयन गरिदैछ\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "तपाई� �उटा 'स�थापना' आदेश वा 'निषेधित-संस�करण' आदेश संगै प�याकेज संस�करण मात�र निर�दिष�ट गर�न "
-"सक�न�ह�न�छ ।\n"
+"सक�न�ह�न�छ"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "तपाई� 'स�थापना' आदेश संगै प�याकेज संग�रह मात�र निर�दिष�ट गर�न�होस� ।\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "तपाई� 'स�थापना' आदेश संगै प�याकेज संग�रह मात�र निर�दिष�ट गर�न�होस�"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -702,7 +690,7 @@ msgstr ""
 "\"%s\" प�याकेज फेला पार�न सकि�न, र तिनीहर�को नाममा ४० प�याकेजहरू भन�दा\n"
 " बढी \"%s\" समविष�ट छ ।\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -711,12 +699,12 @@ msgstr ""
 "\"%s\" प�याकेज फेला पार�न सकि�न । जे भ� पनि, तिनीहर�को नाममा निम�न\n"
 " प�याकेजहरू \"%s\" समविष�ट छन� ।\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "नाम वा वर�णन मेल खाने क�नै प�याकेज फेला परेन \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -734,7 +722,7 @@ msgstr ""
 "\"%s\" संग मेल खाने क�नै प�याकेज फेला परेन । जे भ� पनि, तिनीहर�को वर�णनमा\n"
 " निम�न प�याकेजहरू \"%s\" समाविष�ट ह�न�छन�:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "खराब कार�य क�यारेक�टर '%c'\n"
@@ -757,98 +745,84 @@ msgstr "Err "
 msgid "Changelog download failed: %s"
 msgstr "%s को लग परिवर�तन गर�न�होस�"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "संवेदनशिल-पेजर कार�यन�वयन गर�न सक�दैन, के यो कार�य डेवियन प�रणाली हो ?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "%s �उटा कार�यलय डेवियन प�याकेज होइन, यसको परिवर�तन लग प�रदर�शन गर�न सकिदैन ।"
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "%s को लागि परिवर�तन लग फेला पार�न सकिदैन"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "%s को लागि परिवर�तन लग फेला पार�न सकिदैन"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: clean आदेशले क�नै तर�क लिदैन\n"
+msgid "The clean command takes no arguments"
+msgstr "clean आदेशले क�नै तर�क लिदैन"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Del %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr "तपाई�को गृह डाइरेक�ट�री हेर�न असक�षम भयो, /tmp/function_pkgs मा बचत गरिदैछ!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Del %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: sutoclean आदेशले क�नै तर�क लिदैन\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "autoclean आदेशले क�नै तर�क लिदैन"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "डिस�क खाली ठाऊ�को %sB खाली गर�न�पर�नेछ\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "डिस�क खाली ठाऊ�को %sB खाली गरियो\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "अवैध सञ�चालन %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "अनपेक�षित बान�की तर�क निम�न \"keep-all\" "
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, fuzzy, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+#, fuzzy
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr "निर�भरताहरू हल गर�न असक�षम भयो ।"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "परित�याग गर�न�होस� ।\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "डाउनलोड: तपाई�ले डाउनलोड गर�न कम�तिमा �उटा प�याकेज निर�दिष�ट गर�न�पर�छ\n"
+msgid "download: you must specify at least one package to download"
+msgstr "डाउनलोड: तपाई�ले डाउनलोड गर�न कम�तिमा �उटा प�याकेज निर�दिष�ट गर�न�पर�छ"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "स�रोत सूचि पढ�न सकिदैन"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "\"%s\" नामकरण गरि�को प�याकेज फेला पार�न सकि�न"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -889,30 +863,21 @@ msgid "[Working]"
 msgstr " [काम गर�दै]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "क�नै त�यस�तो प�याकेज छैन \"%s\""
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: forget-new आदेशले क�नै तर�क लिदैन\n"
+msgid "The forget-new command takes no arguments"
+msgstr "forget-new आदेशले क�नै तर�क लिदैन"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "नया� प�याकेजहरू बिर�सन सक�छ\n"
@@ -1022,17 +987,17 @@ msgstr "निमà¥�न पà¥�याकेजहरू सà¥�तरवृदà¥�à
 msgid "The following partially installed packages will be configured:"
 msgstr "निम�न आंशिक स�थपना गरि�का प�याकेज कन�फिगर गरिने छन� ।"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "निम�न आवश�यक प�याकेजहरू हटाइनेछन�!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "निम�न आवश�यक प�याकेजहरू यो कार�य द�वारा विच�छेदन ह�नेछन�:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1041,16 +1006,16 @@ msgstr ""
 "चेतावनी: यो कार�य सम�पादन गर�नाले सम�भवत: तपाई�को प�रणाली विच�छेदन गर�नेछ!\n"
 "        तपाई� के गर�दै ह�न�ह�न�छ यथार�थ नभ�सम�म निरन�तरता नदिन�होस�!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "यो धेरै खराब विचारमा म सावधान छ� "
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "निरन�तरता दिन, वाक�यांश टाइप गर�न�होस� \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1067,7 +1032,7 @@ msgstr ""
 ", तपाई� स�थापना संगै प�रक�रिया गर�न�होस� ।\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1076,7 +1041,7 @@ msgstr ""
 "*** चेतावनी ***   यी विश�वासहरू उलङ�गन गर�न उपेक�षा गरिदैछ किनभने\n"
 "                  %s::CmdLine::विश�वास उलङ�गन गर�न उपेक�षा गर�न� 'ट�र�' हो!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1089,7 +1054,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1098,96 +1063,96 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "के तपाई� यो चेतावनीलाई उपेक�षा गर�न�ह�न�छ र जे भ� पनि प�रक�रिया गर�न�ह�न�छ?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "निरन�तर गर�न, \"%s\" प�रविष�ट गर�न�होस�; परित�याग गर�न, \"%s\" प�रविष�ट गर�न�होस�:"
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "नचिनेको आगत ।  या \"%s\" वा \"%s\" प�रविष�ट गर�न�होस� ।\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "निम�न प�याकेजहरू सिफारिस गरि�का छन� तर स�थापना ह�नेछैन:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "निम�न प�याकेजहरूलाई स��ाब गरि�का छन� तर स�थापना ह�नेछैन:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "क�नै प�याकेजहरू स�थापना ह�ने छैन, स�तरवृद�धि भयो, वा हटाइयो ।\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu प�याकेजहरू स�तरवृद�धि गरियो, %lu नया� स�थापना गरियो,"
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu प�न: स�थापना गरियो,"
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu स�तरकम गरियो, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu हटाउन र %lu स�तरवृद�धि गरि�न ।\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "संग�रहहर�को %sB/%sB प�राप�त गर�न आवश�यक छ । "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "संग�रहहर�को %sB प�राप�त गर�न आवश�यक छ । "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "प�याक गरेपछि %sB प�रयोग ह�नेछन� ।\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "प�याक गरेपछि %sB खाली ह�नेछन� ।\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "देखाउन क�नै प�याकेजहरू छैन -- 'i' पछि रेखामा प�याकेज नाम प�रविष�ट गर�न�होस� ।\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "निरन�तरता दिन 'फर�कन�होस�' थिच�न�होस� ।"
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "क�नै प�याकेजहरू फेला परेन -- 'c' पछि रेखामा प�याकेज नाम प�रविष�ट गर�न�होस� ।\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, fuzzy, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1196,41 +1161,41 @@ msgstr ""
 "प�याकेज फेला परेन -- समर�थन गर�न प�याकेजद�वारा अन�गमन गरि�का खोजीको शून�य वा अरू म�ल "
 "प�रविष�ट गर�न�होस� ।"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "स�थापना स�ग निरन�तरता दिन�होस�"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "परित�याग गर�न�होस� र बन�द गर�न�होस�"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr "�उटा वा धेरै प�याकेजहरू बारे सूचना देखाउन�होस�; प�याकेज नामहर�ले 'i' लाई पछ�याउ�दछ"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1238,39 +1203,39 @@ msgstr ""
 "�उटा वा धेरै प�याकेजहर�को डेवियन परिवर�तन लगहरू देखाउन�होस�; प�याकेज नामहर�ले 'c' लाई "
 "पछ�याउ�दछ"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "निर�भरता सूचनाको प�रदर�शन टगल गर�न�होस�"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "प�याकेज साइजहर�मा परिवर�तनको प�रदर�शन टगल गर�न�होस�"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "संस�करण नम�बरहर�को प�रदर�शन टगल गर�न�होस�"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1278,25 +1243,25 @@ msgstr ""
 "�कल प�याकेज स�थापनाको कारण फेला पार�ने प�रयास गर�न�होस�, वा किन �क प�याकेज स�थापनाले अन�य "
 "प�याकेज स�थापनामा नेतृत�व गर�न�पर�दछ ब�याख�या गर�न�होस� ।"
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "प�रा दृश�यात�मक इन�टरफेस प�रविष�ट गर�न�होस�"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1307,46 +1272,46 @@ msgstr ""
 "�उटा वा धेरै प�याकेज नामहर� (वा बान�कीहरू) ले पछ�या�को �उटा कार�य क�यारेक�टर टाइप गर�न�होस� "
 "। यो कार�यले तपाई�ले सूचि गर�न� भ�को सबै प�याकेजहर�लाई लागू गर�नेछ । निम�न कार�यहरू उपलब�ध छन�:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' प�याकेजहरू स�थापना गर�न"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M' प�याकेजहरू स�थापना गर�न र तत�काल तिनीहर�लाई स�वत: स�थापित भ�को र�पमा ��ण�डयाउने गर�दछ"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' प�याकेजहरू हटाउन"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'-' प�याकेजहरू निर�मल गर�न"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' समाउनेमा प�याकेजहरू राख�न�होस�"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':' समाउनेमा प�याकेजहर�लाई स�थान�तरण नगरी हालको अवास�था राख�न�होस�"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' प�याकेजहरू म�यान�ल�ली स�थापना भ�कोमा चिनो गर�न"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&M' प�याकेजहरू म�यान�ल�ली स�थापना भ�कोमा चिनो गर�न"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1354,53 +1319,53 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' प�याकेजहरू म�यान�ल�ली स�थापना भ�कोमा चिनो गर�न"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "आदेशहरू:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "के तपाई� निरन�तर गर�न चाहन�ह�न�छ ? [Y/n/?]"
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "अवैध प�रतिक�रिया ।  कृपया मद�दतको लागि वैध आदेश वा '?' प�रविष�ट गर�न�होस� ।\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1411,7 +1376,7 @@ msgstr ""
 "निर�भरता सूचना देखिने छन� ।\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1422,7 +1387,7 @@ msgstr ""
 "निर�भरता सूचना देखिने छैन ।\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1433,7 +1398,7 @@ msgstr ""
 "संस�करणहरू देखिने छन� ।\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1444,7 +1409,7 @@ msgstr ""
 "संस�करणहरू देखिने छैन ।\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1455,7 +1420,7 @@ msgstr ""
 "साइज परिवर�तनहरू देखिने छन� ।\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1585,6 +1550,11 @@ msgstr "निमà¥�न '%c' मा अपेकà¥�षित कमà¥�तिमà
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "\"%s\" पछि �उटा संस�करण अपेक�षित गर�दछ"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "क�नै त�यस�तो प�याकेज छैन \"%s\""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1731,7 +1701,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1759,7 +1729,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "निम�न आदेशहरू उपलब�ध छन�:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "हलकर�ता स�थिति लेख�न फाइल:"
 
@@ -1791,7 +1761,7 @@ msgstr ""
 "*** ERROR: घातक अपवादद�वारा परित�याग गरि�को खोजी ।  तपाई�ले\n"
 "           खोजी गर�न निरन�तरता दिन सक�न�ह�न�छ, तर केही समाधान पह��चयोग�य ह�दै�नन� ।"
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1800,25 +1770,24 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "निर�भरताहरू हल गर�न असक�षम भयो! छोडिदैछ..."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "निर�भरताहरू हल गर�न असक�षम भयो ।"
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "%s को iconv असफल भयो ।\n"
+msgid "iconv of %s failed"
+msgstr "%s को iconv असफल भयो"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "खोज�न�होस�: तपाई�ले कम�तिमा �उटा खोज शब�द उपलब�ध गर�न�होस�\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "खोज�न�होस�: तपाई�ले कम�तिमा �उटा खोज शब�द उपलब�ध गर�न�होस�"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1861,7 +1830,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "निम�न प�याकेजहर� संग अन�पयोक�त निर�भरताहरू छन�:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2084,7 +2053,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "प�रदान गर�दछ"
 
@@ -2098,15 +2067,9 @@ msgstr "वर�णन:"
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "प�याकेज %s स�थानिय गर�न असक�षम भयो "
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "बान�की %s पद वर�णन गर�न असक�षम भयो"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "क�नै प�याकेजहरू फेला परेन"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2117,14 +2080,13 @@ msgstr "के प�याकेजहरू डाउनलोड गर�न
 msgid "Internal Error, Ordering didn't finish"
 msgstr "आन�तरिक त�र�टि, आदेश समाप�त भ�को छैन "
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "अप�रचलित डाउनलोड गरेको फाइलहरू मेट�न�होस�"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: अद�यावधिक आदेशले क�नै तर�कहरू लिदैन\n"
+msgid "The update command takes no arguments"
+msgstr "अद�यावधिक आदेशले क�नै तर�कहरू लिदैन"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, fuzzy, c-format
@@ -2141,132 +2103,154 @@ msgstr "पà¥�याकेज \"%s\" को लागि à¤�उटा संसà
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
-#, c-format
-msgid "No candidate version found for %s\n"
-msgstr "%s को लागि क�नै उमेद�वार संस�करण फेला परेन\n"
-
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "%s का लागि क�नै चालू अथवा प�रतिनिधि संस�करण फेला परेन\n"
+msgid "No candidate version found for %s"
+msgstr "%s को लागि क�नै उमेद�वार संस�करण फेला परेन"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "प�याकेज \"%s\" को लागि �उटा संग�रह \"%s\" फेला पार�न असक�षम भयो\n"
+msgid "No current or candidate version found for %s"
+msgstr "%s का लागि क�नै चालू अथवा प�रतिनिधि संस�करण फेला परेन"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "प�याकेज \"%s\" को लागि �उटा संस�करण \"%s\" फेला पार�न असक�षम भयो\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "प�याकेज \"%s\" को लागि �उटा संग�रह \"%s\" फेला पार�न असक�षम भयो"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "आन�तरिक त�र�टि: अवैध मान %i cmdline_find_ver मा पास भयो!\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "प�याकेज \"%s\" को लागि �उटा संस�करण \"%s\" फेला पार�न असक�षम भयो"
 
-#: src/cmdline/cmdline_util.cc:239
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "तपाई� प�याकेजको लागि �उटा संग�रह र �उटा संस�करण द�वै निर�दिष�ट गर�न सक�न�ह�न�न\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "आन�तरिक त�र�टि: अवैध मान %i cmdline_find_ver मा पास भयो!"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "%s को लागि परिवर�तन लग फेला पार�न सकिदैन"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "तपाई� प�याकेजको लागि �उटा संग�रह र �उटा संस�करण द�वै निर�दिष�ट गर�न सक�न�ह�न�न"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "प�याकेज %s स�थानिय गर�न असक�षम भयो "
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "%s को लागि परिवर�तन लग फेला पार�न सकिदैन"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "द�रष�टब�य: स�थापनाको लागि कार�य \"%s: %s\" चयन गरिदैछ\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "%s को लागि परिवर�तन लग फेला पार�न सकिदैन"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "प�याकेजहरू"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "स�रोत प�याकेज:"
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "संग�रह"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "खोज�न�होस�: तपाई�ले कम�तिमा �उटा खोज शब�द उपलब�ध गर�न�होस�\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2292,7 +2276,7 @@ msgstr ""
 msgid "Candidate"
 msgstr "CandVer"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "स�थापना गर�न�होस�"
 
@@ -2396,21 +2380,19 @@ msgstr "लागू गरà¥�ने समसà¥�या फेला पारà¥
 msgid "Packages requiring %s:"
 msgstr "%s मा निर�भर ह�ने प�याकेजहरू"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, fuzzy, c-format
 msgid "No package named \"%s\" exists."
 msgstr "\"%s\" नामकरण गरि�को प�याकेज फेला पार�न सकि�न"
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 #, fuzzy
 msgid "Unable to parse some match patterns."
 msgstr "बान�की %s पद वर�णन गर�न असक�षम भयो"
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 
 #: src/cmdline/cmdline_why.h:212
@@ -2437,11 +2419,11 @@ msgstr "UNSATISFIED"
 msgid "UNAVAILABLE"
 msgstr "UNAVAILABLE"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "ट�यागहरू"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 #, fuzzy
 msgid "User Tags"
 msgstr "ट�यागहरू"
@@ -2643,31 +2625,31 @@ msgstr ""
 "क�यास फाइलमा ताल�चा लगाउन सकिदैन । पढ�ने-मात�र मोडमा खोलिरहेको छ; प�याकेजहर�को "
 "प�रान�तहर�मा क�नै परिवर�तनहरू जोगाउन सकिदैन!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "म�ख�य"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2734,34 +2716,40 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr "प�याकेज क�यास उपलब�ध छैन; प�याकेजहरू डाउनलोड गर�न र स�थापना गर�न असक�षम भयो ।"
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "आन�तरिक त�र�टि: डाउनलोड गर�न प�याकेजहर�को सूचि सिर�जना गर�न सक�दैन"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "%s: %s तान�न असफल भयो"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "उपलब�ध नभ�को प�याकेजहर�का लागि स�धार गर�न सकि�न "
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "प�याकेज स�थापना गर�न असक�षम भयो । प�न:प�राप�त गर�ने प�रयास गरिदैछ:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr "प�रणाली ताल�चा प�न:लाभ गर�न सकिदैन!  (संभवतः अर�को apt वा dpkg चलिरहेको ह�न�छ ?)"
@@ -2910,13 +2898,13 @@ msgstr ""
 "\n"
 "लग समप�त भयो ।\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "प�याकेजहरू डाउनलोड गर�दै"
@@ -3025,18 +3013,18 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "प�याकेज अन�क�रमणिका फाइलहरू दूषित भयो । फाइलनाम छैन: प�याकेज %s को लागि फा�ट ।"
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "%s को लग परिवर�तन गर�न�होस�"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "परिवर�तन लगहरू डाउनलोड गर�न URL प�रयोग गर�न�होस�"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "परिवर�तन लगहरू डाउनलोड गर�न URL प�रयोग गर�न�होस�"
@@ -3085,26 +3073,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "बान�की %s पद वर�णन गर�न असक�षम भयो"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "ट�याग डेटाबेस निर�माण गरिदैछ"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "स�थापना गरि�को छैन"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "स�थापना गरि�को छैन"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3253,40 +3242,40 @@ msgstr ""
 msgid "_File"
 msgstr "बन�द गर�न�होस�"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "सबै हटा�काहरू र स�थापना विचाराधिनहरू कार�यसम�पादन गर�न�होस�"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "प�याकेजहर�को नया� संस�करणका लागि जा�च गर�न�होस�"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "सबै अद�यावधिक गर�न लायक प�याकेजहरू जसलाई अद�यावधिकमा नराखि�को छ भने चिन�ह दिन�होस�"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "विर�सन�होस ज�न प�याकेजहरू \"new\" छन� "
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "सबै विचारधिन स�थापनाहरू, हटाउनेहरू, समात�नेहरू, र अद�यावधिकहरू रद�द गर�न�होस� ।"
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "पहिल�ले डाउनलोड गरि�को प�याकेज फाइलहरू मेट�न�होस�"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "प�न प�न डाउनलोड गर�न नसकिने प�याकेज फाइलहरू मेट�न�होस�"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "प�याकेज क�यास प�न लोड गर�न�होस�"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3296,7 +3285,7 @@ msgstr ""
 "मूलमा जानलाई 'su' चलाउन�होस�; यसले कार�यक�रम फेरि स�रू गर�नेछ, तर तपाई�का सेटिङ�हरू स�रक�षित "
 "गरिनेछ"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "कार�यक�रमबाट निस�कन�होस�"
 
@@ -3304,7 +3293,7 @@ msgstr "कार�यक�रमबाट निस�कन�होस�"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "सञ�चालनहर�को सम�ह वा अन�तिम प�याकेज सञ�चालन पूर�वस�थितिमा फर�काउन�होस�"
 
@@ -3338,7 +3327,7 @@ msgid "_Help"
 msgstr "मद�दत"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3347,19 +3336,19 @@ msgstr ""
 msgid "Update"
 msgstr "सूची अद�यावधिक"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "प�याकेजहरू"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "पूर�वावलोकन"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "समाधान कर�ता"
 
@@ -3546,7 +3535,7 @@ msgid "Fix Manually"
 msgstr "म�यान�अल"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "स�तर वृद�धि गर�न�होस�"
 
@@ -4080,11 +4069,11 @@ msgstr "स�थापना भयो"
 msgid "Reinstall"
 msgstr "प�न:स�थापना गर�न�होस�"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "स�तर कम गर�न�होस�"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "हटाउन�होस�"
 
@@ -4120,7 +4109,7 @@ msgstr "प�याकेज सूचीमा फिल�टर लागू
 msgid "Download already running."
 msgstr "डाउनलोड ह�दैछ..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "�उटा प�याकेज सूची अद�यावधिक वा स�थापना चलाउने पहिले नै लि�को छ ।"
 
@@ -4181,38 +4170,38 @@ msgstr "क�नै पनि बिग�रि�का प�याकेज
 msgid "Asking whether to replace the configuration file %s"
 msgstr "नया� कनफिगरेसन फाइल संग %s बदल�न असक�षम भयो"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "प�याकेजहरू डाउनलोड गर�दै"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "क�नै पनि बिग�रि�का प�याकेजहरू छैन ।"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "क�नै पनि बिग�रि�का प�याकेजहरू छैन ।"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "निर�भरताहरू प�न समाधान गर�न�होस�"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "क�नै पनि प�याकेजहरू बिग�रि�को छैन ।"
 msgstr[1] "क�नै पनि प�याकेजहरू बिग�रि�को छैन ।"
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s परिवर�तनहरू"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s परिवर�तनहरू"
@@ -4220,7 +4209,7 @@ msgstr "%s परिवर�तनहरू"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4230,64 +4219,64 @@ msgstr[1] "%d स�थापना गर�न�होस�"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%s हटाउन असफल "
 msgstr[1] "%s हटाउन असफल "
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "साइज डाउनलोड गर�न�होस�"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "स�थापना भ�न"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "स�थापना भयो"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "^सफा गर�न�होस�"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "राख�न�होस�"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "समाउन�होस�"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "म�यान�अल प�रयोग गर�न�होस�"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4325,7 +4314,7 @@ msgstr "होइन"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4370,17 +4359,17 @@ msgstr "%s; स�वत: रूपमा स�थापना ह�नेछ"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "खोज�न�होस�"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "दृश�य निर�माण गरिदैछ"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "दृश�य निर�माण गरिदैछ"
@@ -5073,113 +5062,114 @@ msgstr "अजà¥�ञात पंकà¥�तिबदà¥�धता पà¥�रकाà
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "By-name  क�रमबद�ध नीतिहर�ले क�नै तर�क लि�न "
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "अवैध शून�य-लम�बाई क�रमबद�ध नीति नाम"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "क�रमबद�ध नीति वर�णनमा '(' मेल खा�न"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "अवैध क�रमबद�ध नीति प�रकार '%s'"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "वह� बाइट स�ट�रिङ, \"%ls\" पछि विसङ�केतन गर�न सकिदैन"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "चौडा-कयारेक�टर स�ट�रिङ�ग \"%s\" पछि डिकोड गर�न सकिदैन"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s, %s %s मा कम�पाइल भयो\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "कम�पाइलर: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 #, fuzzy
 msgid "Compiled against:\n"
 msgstr "कम�पाइलर: g++ %s\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, fuzzy, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "राख�न�होस� %F at version %s (%s)"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, fuzzy, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 "\n"
 "NCurses संस�करण: %s\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, fuzzy, c-format
 msgid "  NCurses version %s\n"
 msgstr ""
 "\n"
 "NCurses संस�करण: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, fuzzy, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "libsigc++ version: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "राख�न�होस� %F at version %s (%s)"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "राख�न�होस� %F at version %s (%s)"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s, %s %s मा कम�पाइल भयो\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:181
 #, fuzzy
 msgid ""
 "\n"
@@ -5188,36 +5178,36 @@ msgstr ""
 "\n"
 "Curses संस�करण: %s\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, fuzzy, c-format
 msgid "  NCurses version: %s\n"
 msgstr ""
 "\n"
 "NCurses संस�करण: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, fuzzy, c-format
 msgid "  cwidget version: %s\n"
 msgstr "libsigc++ version: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, fuzzy, c-format
 msgid "  Apt version: %s\n"
 msgstr ""
 "\n"
 "Curses संस�करण: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "उपयोग: ��काब [-S fname] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       ��काब [options] <action> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5226,59 +5216,59 @@ msgstr ""
 "  कार�यहरू (यदि क�नै पनि निर�दिष�ट छैन भने, ��काबले अन�तरक�रियात�मक मोडलाई प�रविष�ट गर�दछ):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, fuzzy, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr "स�थापना गर�न�होस�        - प�याकेजहरू स�थापना/अद�यावधिक गर�न�होस�\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, fuzzy, c-format
 msgid " remove       - Remove packages.\n"
 msgstr "हटाउन�होस�        प�याकेजहरू हटाउन�होस�\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, fuzzy, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr "निर�मल गर�न�होस�          - प�याकेजहरू र तिनीहर�को कनफिगरेसन हटाउन�होस�\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, fuzzy, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr "समाउन�होस�        समाउनेमा प�याकेजहरू सार�न�होस�\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, fuzzy, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - �उटा प�याकेजको लागि समाति�का आदेश रद�द गर�न�होस�\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, fuzzy, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - मार�क गरि�का प�याकेजहरू स�वत: स�थापना भयो\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, fuzzy, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - मार�क गरि�का प�याकेजहरू म�यान�ल�ली स�थापना भयो\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr "forbid-संस�करण - निर�दिष�ट प�याकेज संस�करणमा स�तरवृद�धिबाट Forbid ��काब ।\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, fuzzy, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr "अद�यावधिक गर�न�होस�       नया�/स�तरवृद�धि गर�न सकिने प�याकेजहरू डाउनलोड गर�न�होस�\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, fuzzy, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr "स�रक�षित स�तरबृद�धि - स�रक�षित स�तरबृद�धि सम�पादन गर�न�होस�\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, fuzzy, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5286,52 +5276,52 @@ msgid ""
 msgstr ""
 "पूरा स�तरबृद�धि - सम�भावित प�याकेज स�थापना गर�दा र हटाउ�दा स�तरबृद�धि सम�पादन गर�न�होस�\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, fuzzy, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr "नया�-बिर�सन�होस�   - बिर�सने प�याकेज \"new\"\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, fuzzy, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr "खोजी गर�न�होस�      नाम र/वा अभिव�यक�ति द�वारा प�याकेजको खोजी गर�न�होस�\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, fuzzy, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr "देखाउन�होस�            - �उटा प�याकेजको बारेमा विस�तृत जानकारी प�रदर�शन गर�न�होस�\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr "देखाउन�होस�            - �उटा प�याकेजको बारेमा विस�तृत जानकारी प�रदर�शन गर�न�होस�\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, fuzzy, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " सफा गर�न�होस�       - डाउनलोड गरि�को प�याकेज फाइलहरू मेट�न�होस�\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, fuzzy, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr "स�वत सफा गर�न�होस�   - प�रानो डाउनलोड गरि�का प�याकेज फाइलहरू मेट�न�होस�\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, fuzzy, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " लग परिवर�तन गर�न�होस�    - प�याकेजको लग परिवर�तन हेर�न�होस�\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, fuzzy, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr "डाउनलोड गर�न�होस�    - �उटा प�याकेजको लागि deb फाइल डाउनलोड गर�न�होस�\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, fuzzy, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5340,7 +5330,7 @@ msgstr ""
 "प�न:स�थापना गर�न�होस�   - हालै स�थापना गरि�को �उटा प�याकेज डाउनलोड र (सम�भवत:) प�न:"
 "स�थापना गर�न�होस�\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5348,7 +5338,7 @@ msgid ""
 "                why one or more packages would require the given package.\n"
 msgstr ""
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5357,44 +5347,44 @@ msgid ""
 "                lead to a conflict with the given package if installed.\n"
 msgstr ""
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  विकल�पहरू:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, fuzzy, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             यो मद�दत पाठ\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             यो मद�दत पाठ\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             कार�यहरू नक�कल गर�न�होस�, तर तिनीहर�ले सा�च�चैकै सम�पादन गर�दैन ।\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -5402,18 +5392,18 @@ msgstr ""
 " -d             प�याकेजहरू मात�र डाउनलोड गर�न�होस�, केही पनि स�थापना गर�ने वा हटाउने "
 "कार�य नगर�न�होस� ।\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, fuzzy, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             यकिन वा कार�यहर�को लागि सधै प�रोम�प�ट गर�न�होस�\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, fuzzy, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             मान�न�होस� कि साधारण हो/होइन प�रश�नको उत�तर 'हो' हो\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, fuzzy, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5422,7 +5412,7 @@ msgstr ""
 " -F ढा�चा         खोजी नतिजाहरू प�रदर�शन गर�नको लागि �उटा ढा�चा निर�दिष�ट गर�न�होस�; "
 "म�यान�ल हेर�न�होस�\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, fuzzy, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5430,60 +5420,60 @@ msgid ""
 msgstr ""
 " -O आदेश        कसरी खोजी नतिजाहरू क�रमबद�ध गर�ने निर�दिष�ट गर�न�होस�, म�यान�ल हेर�न�होस�\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, fuzzy, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr ""
 " -w चौडा         खोजी नतिजाहरू ढा�चाका लागि प�रदर�शन चौडाई निर�दिष�ट गर�न�होस�\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             आक�रमक ढंगले बिग�रेका प�याकेजहरू निश�चित गर�ने प�रयास गर�न�होस� ।\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             प�याकेजहर�को क�न संस�करणहरू स�थापना गर�ने देखाउन�होस� ।\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D              स�वत: परिवर�तन भ�का प�याकेजहर�को निर�भरता देखाउन�होस� ।\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z\t\t     प�रत�येक प�याकेजको स�थापित साइजमा परिवर�तन देखाउन�होस� ।\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, fuzzy, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
 msgstr " -v             अन�य सूचना प�रदर�शन गर�न�होस� । (बह��विद समयमा आपूर�ति ह�न सक�छ)\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, fuzzy, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [release]   स�थापना ह�न लागेको प�याकेजहरू बाट विमोचन सेट गर�न�होस�\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, fuzzy, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr " -q             आदेश-रेखा मोडमा, बढोत�तरीत प�रगति सूचकहरू रोक�न�होस� ।\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, fuzzy, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=val     'क�ञ�जी' नामकरण गरि�को कनफिगरेसन विकल�प सिधै सेट गर�न�होस�\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, fuzzy, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5492,159 +5482,139 @@ msgstr ""
 " --बिना -सिफारिस\t बलियो निर�भरता                     को र�पमा सिफारिसहरू\n"
 " पेश गर�ने नगर�ने निर�दिष�ट गर�न�होस�\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr "-s fname : fname बाट ��काव विस�तारित वस�त�स�थिति सूचना पढ�न�होस� ।\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             स�र�वातमा नया� प�याकेज सूचिहरू डाउनलोड गर�न�होस� ।\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr ""
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             स�र�वातमा �उटा स�थापना सञ�चालन सम�पादन गर�न�होस� ।\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  यो ��काब संग स�पर काऊ शक�ति छैन ।\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 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:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 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:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 msgid "error"
 msgstr "Err "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 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:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "अवैध सञ�चालन %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "-q= पछि अपेक�षित �उटा नम�बर\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "-q= पछि अपेक�षित �उटा नम�बर, %s प�राप�त गर�यो\n"
-
-#: src/main.cc:798
-#, fuzzy, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o लाई क�ञ�जी=मानको र�पमा �उटा तर�कको आवश�यकता छ, %s प�राप�त गर�यो"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "WEIRDNESS: अज�ञात विकल�प कोड प�राप�त भयो\n"
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "प�याकेज "
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "सबै प�याकेजहरू"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5652,36 +5622,31 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "-u र -i को �उटा मात�रै निर�दिष�ट ह�नेछ\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr "आदेश-रेखा मोडमा -u र -i निर�दिष�ट ह�ने छैन (जस�तै, 'install' संगै)"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u र -i आदेश संग निर�दिष�ट ह�ने छैन"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "अज�ञात आदेश \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "अज�ञात आदेश \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "छोडि�को अपवाद: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, fuzzy, c-format
 msgid ""
 "Backtrace:\n"
@@ -5699,7 +5664,7 @@ msgstr "को लागि खोजी गर�न�होस�:"
 msgid "Search backwards for: "
 msgstr "को लागि पछिल�तिर खोजी गर�न�होस�:"
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "माइनस�विपर"
 
@@ -5911,7 +5876,7 @@ msgstr "धराप-मद�दत.पाठको सङ�केतन|UTF-8
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "प�याकेज "
 
@@ -5992,8 +5957,8 @@ msgstr "<N/A>"
 msgid "<none>"
 msgstr "<none>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "अवास�तविक"
@@ -6127,7 +6092,7 @@ msgstr "\"%ls\" पछि पà¥�याकेज पà¥�रदरà¥�शन ढाà
 msgid "Internal error: Default column string is unparsable"
 msgstr "आन�तरिक त�र�टि: पूर�वनिर�धारण स�तम�भ स�ट�रिङ पद वर�णन गर�न अयोग�य छ"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "कार�यहरू"
 
@@ -6280,21 +6245,17 @@ msgstr "मिल�दो अन�क�रमणिकाहरू १ वा
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "मिल�दो अन�क�रमणिका %ls अति ठूलो छ; उपलब�ध समूहहरू (%s) ह�न�"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "TAGLESS PACKAGES"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "MISSING TAG"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "स�रोत प�याकेज:"
@@ -6895,7 +6856,7 @@ msgstr "क�यास लोड गर�दै"
 msgid "Really quit Aptitude?"
 msgstr "साच�चै अभिर�ची अन�त�य गर�न�ह�न�छ ?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -6977,7 +6938,7 @@ msgstr ""
 msgid "License"
 msgstr "^इजाजतपत�र"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 #, fuzzy
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "तपाई�ले प�रतिलिपि गर�न� ह�ने कार�यक�रम अन�तर�गतका शर�तहरू हेर�न�होस�"
@@ -6999,7 +6960,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "मद�दत"
 
@@ -7029,7 +6990,7 @@ msgstr "म�यान�अल"
 msgid "FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "लगातार सोधिने प�रश�नहरूको सूची हर�न�होस�"
 
@@ -7070,15 +7031,15 @@ msgstr ""
 "सामग�रीहरू हटाउन चाहन�ह�न�छ ?  यदि तपाई�ले \"No\" चयन गर�न� भयो भने, तपाई�ले यो संदेश फेरी "
 "देख�न सक�न�ह�न�न ।"
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "प�याकेज डाउनलोडको प�रगति देखाउन�होस�"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "प�याकेज डाउनलोड"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7090,35 +7051,35 @@ msgstr ""
 "स�थापनासंग मात�र बढ�न� पर�दछ यदि तपाई� पक�का ह�न�ह�न�छ भने तपाई�ले के गर�न चाहन�ह�न�छ त�यहि हो ।%n"
 "%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [संस�करण %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "साच�चै निरन�तरता दिन�ह�न�छ"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "स�थापना परित�याग गर�न�होस�"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "प�याकेज स�थापनाको पूर�वावलोकन"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "कार�यसम�पादन गरिने कार�यहरू र/वा समायोजन हेर�न�होस�"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "केहि प�याकेजहरू बिग�रि�का थि� र स�थिर गि�का थि�:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "ति निर�भरता समस�यहर�को क�नै समाधान अवस�थित छैन !"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7127,7 +7088,7 @@ msgstr ""
 "निर�भरताहरू पन� समाधान गर�न खोज�दा खोज�दै समय समाप�त भ�को छ (हेर�डर प�रयास गर�न \"%s\" "
 "थिच�न�होस� )"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7135,20 +7096,20 @@ msgstr ""
 "प�याकेजहरू स�थापना गर�न/हटाउन प�रसाशनिक सह�लियत चाहिन�छ, ज�न तपाई� संग छैन ।  के तपाई�ले मूल "
 "खाता परिवर�तन गर�न चाहन�ह�न�छ ?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "मूलमा जान�होस�"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "मूलमा नजाउन�होस�"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "क�नै पनि प�याकेजहरू स�थापना गर�न, हटाउन, वा अद�यावधिक गर�न कार�यतालिका बद�ध गरि�को छैन ।"
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7158,19 +7119,19 @@ msgstr ""
 "तर तपाई�ले तिनिहर�लाई अद�यावधिक गर�ने भनि रोज�न� भ�को छैन।   \"U\" टाइप गरेर "
 "अद�यावधिकको तयारी गर�न�होस� ।"
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "प�याकेज सूची अद�यावधिक गर�दै"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "प�याकेज सूचीको अद�यावधिक प�रगति हेर�न�होस�"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "सूची अद�यावधिक"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7178,23 +7139,23 @@ msgstr ""
 "प�याकेज सूचीहरू अद�यावधिक गर�न प�रशासनिक सह�लियत चाहिन�छ, ज�न तपाई� संग हालमा छैन । के "
 "तपाई�ले मूल खाता परिवर�तन गर�न चाहन�ह�न�छ ?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "बेकाम समयमा बिस�फोटकहरू फेला पार�न कोशिस गर�न�होस�"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "डाउनलोड प�रगतिमा हदै गर�दा खालि गर�न अन�मति छैन"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "डाउनलोड फाइलहरू मेट�दैछ"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "डाउनलोड गरि�को प�याकेज फाइलहरू मेटि�को छ"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7203,18 +7164,18 @@ msgstr ""
 "प�याकेज सूचीहरू अद�यावधिक गर�न प�रशासनिक सह�लियत चाहिन�छ, ज�न तपाई� संग हालमा छैन । के "
 "तपाई�ले मूल खाता परिवर�तन गर�न चाहन�ह�न�छ ?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "apt क�यास फाइल उपलब�ध छैन; स�वत सफा गर�न सकिदैन ।"
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "अप�रचलित डाउनलोड गर�ने प�याकेज फाइलहरू मेटि�को छ, %sB डिस�क खाली गर�दै ।"
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7223,121 +7184,121 @@ msgstr ""
 "प�याकेज सूचीहरू अद�यावधिक गर�न प�रशासनिक सह�लियत चाहिन�छ, ज�न तपाई� संग हालमा छैन । के "
 "तपाई�ले मूल खाता परिवर�तन गर�न चाहन�ह�न�छ ?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "बढि समाधानहरू छैन ।"
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "लागू गर�ने समस�या फेला पार�न असक�षम"
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "समस�या समाधान गर�न प�रयास गर�दै गर�दा समय समाप�त भ�को छ ।"
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "निर�भरताहरू प�न समाधान गर�न�होस�"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "असन�त�ष�ट निर�भरताहर�को समाधानका लागि खोज�न�होस�"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "खोल�न असक�षम %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "प�न समाधान गर�ने स�थिति डम�प गर�दा त�र�टि"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^प�याकेजहरू स�थापना गर�न�होस�/हटाउन�होस�"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^प�याकेज सूची अद�यावधिक गर�न�होस�"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Up^gradable लाई चिनो लगाउन�होस�"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^नया� प�याकेजहरू बिर�सन�होस�"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "विचारधिन कार�यहरू रद�द गर�न�होस�"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^प�याकेज क�यास सफा गर�न�होस�"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "अप�रचलित फाइलहरू खालि गर�न�होस�"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^प�याकेज क�यास प�न लोड गर�न�होस�"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^माइनस�इपर खेल�न�होस�"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^प�रमूलमा जान�होस�"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^अन�त�य गर�न�होस�"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "प�र�वस�थितिमा फर�काउन�होस�"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^स�थापना गर�न�होस�"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr " हालमा चयन गरि�को प�याकेज"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^हटाउन�होस�"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "हटाउनका लागि हालमा चयन गरि�को प�याकेज ��न�डाउन�होस�"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^सफा गर�न�होस�"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "यसका कन�फिगरेसन फाइलहरू हटाउनका लागि हालमा चयन गरि�को प�याकेजहरू ��न�डाउन�होस�"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^राख�न�होस�"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "चयन गरि�को प�याकेजबाट क�नै कार�य रद�द गर�न�होस�"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^समाउन�होस�"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7345,11 +7306,11 @@ msgstr ""
 "चयन गरि�को प�याकेजहरू बाट क�नै कार�य रद�द गर�न�होस�, र भविष�यको अद�यावधिक बाट यसलाई "
 "स�रक�षा दिन�होस�"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "स�वत चिन�ह दिन�होस�"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7357,11 +7318,11 @@ msgstr ""
 "स�वत: स�थापना भ�को चयन भ�का प�याकेजलाई चिनो लगाउन�होस�; यदि यसमा अन�य प�याकेजहरू "
 "आधारित भ�न भने यो स�वत: हट�नेछ  "
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "म�यान�अल चिन�ह दिन�होस�"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7369,11 +7330,11 @@ msgstr ""
 "म�यान�ल तरिकाले स�थापना भ�को चयन भ�का प�याकेजलाई चिनो लगाउन�होस�; यसलाई म�यान�ल�ली "
 "नहटा� सम�म यो हट�नेछैन"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^संस�करण रोक�न�होस�"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7381,248 +7342,248 @@ msgstr ""
 "स�थापना ह�दै गरेको बाट चयन गरि�को प�याकेजको उमेम�दारलाई रोक�न�होस�; नया� संस�करणको प�याकेजहरू "
 "सामान�य जस�तै स�थापना ह�नेछ"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^सूचना"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "चयन गरि�को प�याकेज बारेमा बढि सूचना प�रर�दशन गर�न�होस�"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^परिवर�तनलग"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "चयन गरि�को प�याकेजमा डेवियन परिवर�तनलग प�रर�दशन गर�न�होस�"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^समाधान परिक�षण गर�न�होस�"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "हालमा चयन गरि�को समाधानलाई निर�भरता समस�याहर�मा परिक�षण गर�न�होस� ।"
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "समाधान लागू गर�न�होस�"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "हालमा चयन गरि�को समाधानमा समाहित कार�यहरू प�रा गर�न�होस�"
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^पछिल�लो समाधान"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "निर�भरता समस�याहर�को पछिल�लो समाधान चयन गर�न�होस�"
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^अघिल�लो समाधान"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "निर�भरता समस�याहर�को अघिल�लो समाधान चयन गर�न�होस� ।"
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^पहिलो समाधान"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "निर�भरता समस�याहर�को पहिलो समाधान चयन गर�न�होस�"
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "अन�तिम समाधान"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "निर�भरता समस�याहर�मा अन�तिम समाधान चयन गर�न�होस� ज�न अति टाढा सिर�जना भ�को छ ।"
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "टगल अस�वीकृत"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "हालमा अस�वीकार भ�को कार�य चयन गरि�को कार�य टगल गर�ने कि"
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "टगल ^प�रमाणित भयो"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "हालमा सदर भ�को कार�य चयन गरि�को टगल गर�ने कि"
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^लक�ष�य हेर�न�होस�"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "जसलाई चयन कार�यबाट प�रवाहित ह�ने प�याकेजहरू हेर�न�होस�"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "फेला पार�न�होस�"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "अघिल�तिर खोज�न�होस�"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "^पछाडिपट�टी फेला पार�न�होस�"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "पछाडिपट�टी खोज�न�होस�"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "फेरि फेला पार�न�होस�"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "अन�तिम खोजी दोहोर�याउन�होस�"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "^Backwards फेरि फेला पार�न�होस�"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "विपरित दिशामा अन�तिम खोजी दोहोर�याउन�होस�"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "सिमित प�रर�दशन"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "प�याकेज सूचीमा फिल�टर लागू गर�न�होस�"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^असिमित प�रर�दशन"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "फिल�टरलाई प�याकेज सूचीबाट हटाउन�होस�"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "बिग�रेको फेला पार�न�होस�"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "अर�को प�याकेजहरू संग असन�त�ष�ट निर�भरताहरू फेला पार�न�होस�"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 #, fuzzy
 msgid "^Preferences"
 msgstr "पूर�व निर�भर गर�दछ"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^UI विकल�पहरू"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "सेटिङ� परिवर�तन गर�न�होस� जसले प�रयोगकर�ता इन�टरफेसलाई असर पार�दछ"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^निर�भरता ह�यान�डलिङ�"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "सेटिङ�हरू परिवर�तन गर�न�होस� जसले कसरि प�याकेजहरू निर�भरताहरू ह�यान�डल गर�नेलाई असर� पार�दछ"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^विविध"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "विविध कार�यक�रम सेटिङ�हरू परिवर�तन गर�न�होस�"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^विकल�पहरू पछाडि फर�कन�होस�"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "प�रणाली प�र�वनिर�धारितहर�मा सबै सेटिङ�हरू रिसेट गर�न�होस�"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^पछिल�लो"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "पछिल�लो प�रर�दशन हेर�न�होस�"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Prev"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "अधिल�लो प�रर�दशन हेर�न�होस�"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^बन�द गर�न�होस�"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "यो प�रर�दशन बन�द गर�न�होस�"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "नया� प�याकेज दृश�य"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "नया� प�र�वनिर�धारित प�याकेज सूची सिर�जना गर�न�होस�"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "सिफारिशहरू लेखा जा�च�न�होस�"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7630,87 +7591,87 @@ msgstr ""
 "तपाई�लाई स�थापना गर�न प�रस�ताव गर�ने प�याकेजहरू हेर�न�होस�, तर ज�न हालमा स�थापना गरि�को होइन "
 "।"
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "नया� फ�याट प�याकेज सूची"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "�कल कोटि नगरि�को सूची प�रणालीमा सबै प�याकेजहरू हेर�न�होस�"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "नया� डेबट�याग ब�राउजर"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "डेबट�याग डेटा प�रयोग गर�दै प�याकेजहरू ब�राउज गर�न�होस�"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "नया� कोटिगत ब�राउजर"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "कोटिद�धारा प�याकेजहरू ब�राउज गर�न�होस�"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^बारेमा"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "यो कार�यक�रमको बारेको सूचना हेर�न�होस�"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^मद�दत"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "अनलाइन मद�दत हर�न�होस�"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "प�रयोगकर�ताको ^म�यान�अल"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "विस�तृत कार�यक�रम म�यान�अल हेर�न�होस�"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^समाचार"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "प�रत�येक संस�करणमा गरि�का महत�वप�र�ण परिवर�तनहरू हर�न�होस�"
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^इजाजतपत�र"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "कार�यहरू"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "खोज�न�होस�"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "विकल�पहरू"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "दृश�यहरू"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7719,11 +7680,11 @@ msgstr ""
 "%ls: मेन�  %ls: मद�दत  %ls: बन�द गर�न�होस�  %ls: अद�यावधिक गर�न�होस�  %ls: डाउनलोड/"
 "Iस�थापना/हटाउन�होस� Pkgs"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -7751,9 +7712,40 @@ msgstr "परिवर�तन लगहरू डाउनलोड गर�
 msgid "Downloading the changelog of %s"
 msgstr "परिवर�तनलग डाउनलोड गर�दै"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "तपाई�ले आधिकारिक डेवि�न प�याकेजहर�को परिवर�तनलग मात�र हर�न सक�न�ह�न�छ ।"
+#~ msgid "MISSING TAG"
+#~ msgstr "MISSING TAG"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "परिवर�तन लगहरू डाउनलोड गर�न URL प�रयोग गर�न�होस�"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr "%s �उटा कार�यलय डेवियन प�याकेज होइन, यसको परिवर�तन लग प�रदर�शन गर�न सकिदैन ।"
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "\"%s\" नामकरण गरि�को प�याकेज फेला पार�न सकि�न"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "बान�की %s पद वर�णन गर�न असक�षम भयो"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "-q= पछि अपेक�षित �उटा नम�बर\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "-q= पछि अपेक�षित �उटा नम�बर, %s प�राप�त गर�यो\n"
+
+#, fuzzy
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o लाई क�ञ�जी=मानको र�पमा �उटा तर�कको आवश�यकता छ, %s प�राप�त गर�यो"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "WEIRDNESS: अज�ञात विकल�प कोड प�राप�त भयो\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u र -i आदेश संग निर�दिष�ट ह�ने छैन"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "तपाई�ले आधिकारिक डेवि�न प�याकेजहर�को परिवर�तनलग मात�र हर�न सक�न�ह�न�छ ।"
 
 #~ msgid "Unable to open /usr/share/tasksel/debian-tasks.desc"
 #~ msgstr "/usr/share/tasksel/debian-tasks.desc खोल�न असक�षम भयो"
@@ -7880,11 +7872,6 @@ msgstr "तपाई�ले आधिकारिक डेवि�न प�
 #~ msgstr "परिवर�तनलग डाउनलोड गर�दै"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "क�नै पनि रिसोल�सन फेला परेन ।"
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "प�याकेज सोपानक�रम फाइल %s खोल�न सकि�न"
diff --git a/po/nl.gmo b/po/nl.gmo
index 16d0b2b3..7565bd77 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index 518723c9..d5905f97 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:27+0800\n"
 "Last-Translator: Frans Pop <elendil@planet.nl>\n"
 "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -332,74 +332,63 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "Te gebruiken URL voor het ophalen van changelogs"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Toon een preview van wat zal gebeuren alvorens het uit te voeren"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 "Vergeet welke pakketten \"nieuw\" zijn wanneer de pakketlijsten zijn "
 "bijgewerkt"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Vergeet welke pakketten \"nieuw\" zijn wanneer pakketten worden "
 "geïnstalleerd of verwijderd"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "Toon geen waarschuwing wanneer de eerste wijziging wordt gemaakt in alleen-"
 "lezen modus"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Waarschuw wanneer geprobeerd wordt een gepriviligeerde actie uit te voeren "
 "als een niet-root-gebruiker"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -407,11 +396,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Bestand om acties in bij te houden"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -419,12 +408,12 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr ""
 "Los afhankelijkheden automatisch op wanneer een pakket wordt geselecteerd"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -432,12 +421,12 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Repareer automatisch defecte pakketten alvorens te installeren of verwijderen"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -445,11 +434,11 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Installeer aanbevolen pakketten automatisch"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -460,11 +449,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Verwijder automatisch ongebruikte pakketten"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -475,22 +464,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Pakketten die nooit automatisch verwijderd mogen worden"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -503,15 +492,15 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Interface-opties"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Afhankelijkheidsafhandeling"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Allerlei"
 
@@ -615,7 +604,7 @@ msgstr "Geen bronpakket gevonden voor \"%s\".\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Kan de 'build-depends' niet voldoen: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -624,7 +613,7 @@ msgstr ""
 "Opmerking: \"%s\", wat het virtueel pakket \"%s\" aanbiedt,\n"
 "is reeds geïnstalleerd.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -633,7 +622,7 @@ msgstr ""
 "Opmerking: \"%s\", wat het virtueel pakket \"%s\" aanbiedt,\n"
 "zal reeds geïnstalleerd worden.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -642,17 +631,22 @@ msgstr ""
 "\"%s\" bestaat in de pakketdatabase, maar het is geen\n"
 "echt pakket en er is geen pakket die erin voorziet.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" is een virtueel pakket waarin wordt voorzien door:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "U moet er één kiezen om te installeren.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Pakket '%s' heeft geen kandidaat voor installatie"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -661,67 +655,60 @@ msgstr ""
 "Opmerking: \"%s\" geselecteerd in plaats van het\n"
 "     virtueel pakket \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s is reeds geïnstalleerd met de gevraagde versie (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 "%s is op dit moment niet geïnstalleerd, dus zal het niet opnieuw worden "
 "geïnstalleerd.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s is reeds geïnstalleerd met de gevraagde versie (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 "%s is op dit moment niet geïnstalleerd, dus zal het niet opnieuw worden "
 "geïnstalleerd.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Pakket %s is niet geïnstalleerd, dus wordt het niet verwijderd\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pakket %s is niet geïnstalleerd, kan een opwaardering niet verbieden\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Pakket %s is niet opwaardeerbaar, kan een opwaardering niet verbieden\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Opmerking: de taak \"%s: %s\" geselecteerd voor installatie\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "U kunt enkel een pakketversie aangeven met een 'install'-commando of een "
-"'forbid-version'-commando.\n"
+"'forbid-version'-commando"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "U kunt enkel een pakketarchief aangeven met een 'install'-commando\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "U kunt enkel een pakketarchief aangeven met een 'install'-commando"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -730,7 +717,7 @@ msgstr ""
 "Pakket \"%s\" is niet gevonden, en meer dan 40\n"
 "pakketten hebben \"%s\" in hun naam.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -739,14 +726,14 @@ msgstr ""
 "Pakket \"%s\" is niet gevonden. Wel hebben de volgende\n"
 "pakketten \"%s\" in hun naam:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Geen enkel pakket gevonden waarvan de naam of beschrijving overeenkomen met "
 "\"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -765,7 +752,7 @@ msgstr ""
 "volgende\n"
 "pakketten \"%s\" in hun beschrijving:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Slecht actiekarakter '%c'\n"
@@ -788,100 +775,85 @@ msgstr "Fout "
 msgid "Changelog download failed: %s"
 msgstr "ChangeLog van %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "Kan 'sensible-pager' niet uitvoeren, is dit een werkend Debian-systeem?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "%s is geen officieel Debian-pakket, kan zijn changelog niet tonen."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Kon changelog voor %s niet vinden"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "Kon changelog voor %s niet vinden"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: Het commando 'clean' kent geen argumenten\n"
+msgid "The clean command takes no arguments"
+msgstr "Het commando 'clean' kent geen argumenten"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Verwijder %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr "Kan uw thuismap niet opzoeken, bewaren in /tmp/function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Verwijder %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: Het commando 'autoclean' kent geen argumenten\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Het commando 'autoclean' kent geen argumenten"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Er zal %sB schijfruimte vrijkomen\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "%sB schijfruimte vrijgemaakt\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ongeldige operatie %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Onverwacht patroonargument na \"keep-all\""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
-"Kan afhankelijkheden niet oplossen; u kunt met --full-resolver proberen.\n"
+"Kan afhankelijkheden niet oplossen; u kunt met --full-resolver proberen"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Breek af.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "ophalen: u moet minstens één pakket aangeven om op te halen\n"
+msgid "download: you must specify at least one package to download"
+msgstr "ophalen: u moet minstens één pakket aangeven om op te halen"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Kon bronnenlijst niet lezen"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Kan geen pakket vinden met als naam \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -921,22 +893,14 @@ msgid "[Working]"
 msgstr "[Bezig]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: tenminste één argument is vereist (de map\n"
-"waarin bestanden moeten worden weggeschreven).\n"
+"extract-cache-entries: tenminste één argument is vereist (de map waarin "
+"bestanden moeten worden weggeschreven)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Pakket \"%s\" bestaat niet"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
@@ -944,11 +908,10 @@ msgstr ""
 "doen.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: Het commando 'forget-new' kent geen argumenten\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Het commando 'forget-new' kent geen argumenten"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Zou vergeten welke pakketten nieuw zijn\n"
@@ -1060,18 +1023,18 @@ msgstr ""
 "De volgende gedeeltelijk geïnstalleerde pakketten zullen worden "
 "geconfigureerd:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "De volgende ESSENTIËLE pakketten zullen worden VERWIJDERD!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "De volgende ESSENTIËLE pakketten zullen door deze actie DEFECT raken:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1081,16 +1044,16 @@ msgstr ""
 "              werking van uw systeem aantasten!\n"
 "              Ga NIET verder, tenzij u EXACT weet wat u aan het doen bent!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Ik weet dat dit een heel slecht idee is"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Om verder te gaan, type de zin \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1107,7 +1070,7 @@ msgstr ""
 "Ga alleen verder met de installatie als u zeker weet dat dat is wat u wilt.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1116,7 +1079,7 @@ msgstr ""
 "*** WAARSCHUWING *** Deze vertrouwensschendingen worden genegeerd omdat\n"
 "                     %s::CmdLine::Ignore-Trust-Violations 'true' is!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1129,7 +1092,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1138,105 +1101,105 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Wilt u deze waarschuwing negeren en toch verdergaan?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Geef \"%s\" in om verder te gaan, geef \"%s\" in om af te breken: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Niet-herkende invoer. Geef ofwel \"%s\" ofwel \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr ""
 "De volgende pakketten worden AANGERADEN, maar zullen NIET worden "
 "geïnstalleerd:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 "De volgende pakketten worden GESUGGEREERD, maar zullen NIET worden "
 "geïnstalleerd:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 "Er zullen geen pakketten worden geïnstalleerd, opgewaardeerd of verwijderd.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pakketten opgewaardeerd, %lu nieuwe geïnstalleerd, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu geherinstalleerd, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu gedegradeerd, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu te verwijderen en %lu niet opwaarderen.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Heb %sB/%sB archieven nodig. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Heb %sB archieven nodig. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Na uitpakken zal %sB worden gebruikt.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Na uitpakken zal %sB worden vrijgemaakt.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Er zijn geen te tonen pakketten -- geef de pakketnamen in op de regel achter "
 "'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Druk op return om verder te gaan."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Er zijn geen pakketten gevonden -- geef de pakketnamen in op de regel achter "
 "'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1245,30 +1208,30 @@ msgstr ""
 "Geen pakketten gevonden -- geef nul of meer startpunten op gevolgd door het "
 "te rechtvaardigen pakket.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "j: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "ga verder met de installatie"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "afbreken en afsluiten"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1276,12 +1239,12 @@ msgstr ""
 "toon informatie over één of meer pakketten; de pakketnamen behoren achter de "
 "'i'"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1289,39 +1252,39 @@ msgstr ""
 "toon de Debian-changelogs van één of meer pakketten; de pakketnamen behoren "
 "achter de 'c'"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "a: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "schakel de weergave van afhankelijkheidsinformatie"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "g: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "schakel de weergave van wijzigingen in pakketgroottes"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "schakel de weergave van versienummers"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1330,27 +1293,27 @@ msgstr ""
 "waarom installatie van een pakket zou leiden tot installatie van een ander "
 "pakket."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "o: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "start automatische oplossing van afhankelijkheden om defecte "
 "afhankelijkheden te repareren."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "g: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "geef de volledige grafische interface"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1362,49 +1325,49 @@ msgstr ""
 "patronen). De actie zal worden uitgevoerd op alle pakketten die u opgeeft. "
 "De volgende acties zijn beschikbaar:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' om pakketten te installeren"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M' om pakketten te installeren en onmiddellijk als automatisch "
 "geïnstalleerd markeren"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' om pakketten te verwijderen"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' om pakketten te wissen (purge)"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' om pakketten te behouden"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 "':' om pakketten in hun huidige toestand te houden zonder ze op 'behouden' "
 "te zetten"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr " '&M' om pakketten als automatisch geïnstalleerd te markeren"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' om pakketten als handmatig geïnstalleerd te markeren"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1412,29 +1375,29 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr " '&M' om pakketten als automatisch geïnstalleerd te markeren"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Commando's:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1442,19 +1405,19 @@ msgstr ""
 "aptitude kan geen oplossing voor deze afhankelijkheden vinden. U kunt ze "
 "handmatig oplossen of 'n' typen om te stoppen."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Wilt u verder gaan? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Deze afhankelijkheden handmatig oplossen? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Ongeldig antwoord. Geef een geldig commando of '?' voor hulp.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1463,7 +1426,7 @@ msgstr ""
 "installeren, 'R' om automatisch te proberen afhankelijkheden op te lossen of "
 "'N' om te stoppen."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1474,7 +1437,7 @@ msgstr ""
 "Er zal afhankelijkheidsinformatie worden getoond.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1485,7 +1448,7 @@ msgstr ""
 "Er zal geen afhankelijkheidsinformatie worden getoond.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1496,7 +1459,7 @@ msgstr ""
 "Er zullen versies worden getoond.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1507,7 +1470,7 @@ msgstr ""
 "Er zullen geen versies worden getoond.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1518,7 +1481,7 @@ msgstr ""
 "Er zullen groottewijzigingen worden getoond.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1655,6 +1618,11 @@ msgstr "Verwachtte tenminste één pakket/versie-paar na '%c'"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Verwachtte een versie of \"%s\" na \"%s\""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Pakket \"%s\" bestaat niet"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1801,7 +1769,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1831,7 +1799,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "De volgende commando's zijn beschikbaar:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Bestand om status van de oplosser naar weg te schrijven:"
 
@@ -1863,7 +1831,7 @@ msgstr ""
 "*** FOUT: zoekopdracht afgebroken vanwege fatale fout. U kunt de opdracht\n"
 "          vervolgen, maar sommige oplossingen zullen onbereikbaar zijn."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1872,27 +1840,26 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Kan afhankelijkheden voor de opwaardering niet oplossen: geen oplossing "
 "gevonden."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Kan afhankelijkheden voor de opwaardering niet oplossen (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "iconv van %s is mislukt.\n"
+msgid "iconv of %s failed"
+msgstr "iconv van %s is mislukt"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "zoeken: U moet minstens één zoekterm opgeven\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "zoeken: U moet minstens één zoekterm opgeven"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1935,7 +1902,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "De volgende pakketten hebben niet-voldane afhankelijkheden:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2158,7 +2125,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Voorziet in"
 
@@ -2172,15 +2139,9 @@ msgstr "Beschrijving: "
 msgid "Homepage: "
 msgstr "Homepage: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Kan pakket %s niet localiseren"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Kan patroon %s niet ontleden"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Geen pakketten gevonden"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2191,14 +2152,13 @@ msgstr "Zou ophalen/installeren/verwijderen van pakketten.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Interne Fout, Ordening is nog niet gedaan"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Verwijderen van verouderde, opgehaalde bestanden"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: Het commando 'update' kent geen argumenten\n"
+msgid "The update command takes no arguments"
+msgstr "Het commando 'update' kent geen argumenten"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2217,132 +2177,154 @@ msgstr ""
 "%s: te weinig argumenten; verwacht tenminste de naam van een label en een "
 "pakket.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Geen kandidaat versie gevonden voor %s\n"
+msgid "No candidate version found for %s"
+msgstr "Geen kandidaat versie gevonden voor %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Geen huidige of kandidaat versie gevonden voor %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "Geen huidige of kandidaat versie gevonden voor %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Geen \"%s\"-archief gevonden voor het pakket \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Geen \"%s\"-archief gevonden voor het pakket \"%s\""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Geen versie \"%s\" gevonden voor pakket \"%s\"\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Geen versie \"%s\" gevonden voor pakket \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Interne fout: ongeldige waarde %i meegegeven met cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Interne fout: ongeldige waarde %i meegegeven met cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "U kunt niet èn een archief èn een versie aangeven voor een pakket\n"
-
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Kon changelog voor %s niet vinden"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "U kunt niet èn een archief èn een versie aangeven voor een pakket"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d defect [%+d]"
 msgstr[1] "%d defect [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d opwaardering [%+d]"
 msgstr[1] "%d opwaarderingen [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d nieuw [%+d]"
 msgstr[1] "%d nieuw [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Huidige status: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "Er is %d nieuw verouderd pakket."
 msgstr[1] "Er zijn %d nieuw verouderde pakketten."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "Er is %d nieuw verouderd pakket:"
 msgstr[1] "Er zijn %d nieuw verouderde pakketten."
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Ontbrekende komma na labelnaam \"%s\""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Kan pakket %s niet localiseren"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Kon changelog voor %s niet vinden"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Opmerking: de taak \"%s: %s\" geselecteerd voor installatie\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Kon changelog voor %s niet vinden"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Pakketten"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Bronpakket: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "Archief"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "zoeken: U moet minstens één zoekterm opgeven\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2365,7 +2347,7 @@ msgstr "Huidig"
 msgid "Candidate"
 msgstr "Kandidaat"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Installeren"
 
@@ -2467,22 +2449,20 @@ msgstr "Kan geen reden vinden op %s te installeren.\n"
 msgid "Packages requiring %s:"
 msgstr "Pakketten die afhangen van %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Er bestaat geen pakket genaamd \"%s\"."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Kan sommige vergelijkingspatronen niet ontleden."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
-"%s: de opdracht vereist tenminste één argument (het te bevragen pakket).\n"
+"%s: de opdracht vereist tenminste één argument (het te bevragen pakket)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2508,11 +2488,11 @@ msgstr "NIET VOLDAAN"
 msgid "UNAVAILABLE"
 msgstr "NIET AANWEZIG"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Labels"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Gebruikerslabels"
 
@@ -2722,32 +2702,32 @@ msgstr ""
 "Wordt geopend in alleen-lezen modus; wijzigingen in de toestand van de "
 "pakketten zullen NIET worden bewaard!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 msgid "allowed"
 msgstr "allow_choices"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "hoofd"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2814,38 +2794,46 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "De pakketcache is niet beschikbaar; onmogelijk om pakketten af te halen en "
 "te installeren."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Interne fout: kon lijst van op te halen pakketten niet genereren"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Fout bij ophalen van %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Kon sommige archieven niet ophalen, misschien kunt u 'aptitude update' of --"
+"fix-missing proberen?"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Kan niet corrigeren voor niet aanwezige pakketten"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr ""
 "Een pakket kon niet geïnstalleerd worden. Er wordt geprobeerd om te "
 "herstellen:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2997,13 +2985,13 @@ msgstr ""
 "\n"
 "Logboek volledig.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "Ophalen pakketten"
@@ -3116,18 +3104,18 @@ msgstr ""
 "De pakketindexbestanden zijn gecorumpeerd. Veld 'Filename:' voor pakket %s "
 "ontbreekt."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Changelog van %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "Te gebruiken URL voor het ophalen van changelogs"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Te gebruiken URL voor het ophalen van changelogs"
@@ -3176,26 +3164,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Kan patroon %s niet ontleden"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Opbouwen van label-database"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "Niet-geïnstalleerd"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "Niet-geïnstalleerd"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3344,43 +3333,43 @@ msgstr ""
 msgid "_File"
 msgstr "Onwaar"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Doe alle uitstaande installaties en verwijderingen"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Controleer op nieuwe versies van pakketten"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Markeer alle opwaardeerbare pakketten die niet vastgehouden zijn voor "
 "opwaardering"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Vergeet welke pakketten \"nieuw\" zijn"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Annuleer al het installeren, verwijderen, behouden en opwaarderen van "
 "pakketten"
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Verwijder pakketbestanden die vroeger opgehaald zijn"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Verwijder pakketbestanden die niet langer kunnen opgehaald worden"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Herlaad de pakketcache"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3390,7 +3379,7 @@ msgstr ""
 "Voer 'su' uit om root te worden; dit zal het programma herstarten, maar uw "
 "instellingen zullen bewaard blijven"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Sluit het programma af"
 
@@ -3398,7 +3387,7 @@ msgstr "Sluit het programma af"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Maak de laatste pakketoperatie of groep van operaties ongedaan"
 
@@ -3432,7 +3421,7 @@ msgid "_Help"
 msgstr "Help"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3441,19 +3430,19 @@ msgstr ""
 msgid "Update"
 msgstr "Lijst Bijwerken"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Pakketten"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Vooruitblik"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Oplosser"
 
@@ -3640,7 +3629,7 @@ msgid "Fix Manually"
 msgstr "Handmatig"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Opwaarderen"
 
@@ -4173,11 +4162,11 @@ msgstr "Geïnstalleerd"
 msgid "Reinstall"
 msgstr "Herinstalleren"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Degraderen"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Verwijderen"
 
@@ -4213,7 +4202,7 @@ msgstr "Pas een filter toe op de pakketlijst"
 msgid "Download already running."
 msgstr "Bezig met ophalen... "
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Een bijwerking van de pakketlijst of een installatieloop is reeds aan de "
@@ -4276,38 +4265,38 @@ msgstr "Geen defecte pakketten."
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Kan %s niet vervangen door nieuw configuratiebestand"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Ophalen pakketten"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "Geen defecte pakketten."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "Geen defecte pakketten."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "Afhankelijkheden Oplossen"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Er zijn geen defecte pakketten."
 msgstr[1] "Er zijn geen defecte pakketten."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s wijzigingen"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s wijzigingen"
@@ -4315,7 +4304,7 @@ msgstr "%s wijzigingen"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4325,64 +4314,64 @@ msgstr[1] "%d installatie"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "kon %s niet verwijderen"
 msgstr[1] "kon %s niet verwijderen"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "Ophaalgrootte"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "niet geïnstalleerd"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "Geïnstalleerd"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "^Wis (purge)"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Behouden"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Bevriezen"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "Gebruikershandleiding"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4422,7 +4411,7 @@ msgstr "nee"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4467,17 +4456,17 @@ msgstr "%s; zal automatisch worden geïnstalleerd"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "Zoek"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "Beeld opbouwen"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Beeld opbouwen"
@@ -5178,108 +5167,109 @@ msgstr "Onbekend aliniëringstype '%s'"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "By-name sorteerbeleid neemt geen argumenten"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Ongeldige zero-length sorteerbeleid"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Ongebalanceerd '(' in sorteerbeleidbeschrijving"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Ongeldig sorteerbeleid type '%s'"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Kan multibyte string na \"%ls\" niet ontcijferen"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Kan wide-character string na \"%s\" niet ontcijferen"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s gecompileerd in %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compiler: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Gecompileerd tegen:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt-versie %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  NCurses-versie: onbekend\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  NCurses-versie %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++-versie: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Ondersteuning van 'ept' actief.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Ondersteuning van 'ept' niet actief.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt-versie %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt-versie %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Ondersteuning van 'ept' niet actief.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s gecompileerd in %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Ondersteuning van 'ept' niet actief.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5287,32 +5277,32 @@ msgstr ""
 "\n"
 "Huidige bibilotheek-versies:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr " NCurses-versie: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  cwidget-versie: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  apt-versie: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Gebruik: aptitude [-S fnaam] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opties] <actie> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5322,42 +5312,42 @@ msgstr ""
 "modus starten):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Pakketten installeren/opwaarderen.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Pakketten verwijderen.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Pakketten en hun configuratiebestanden verwijderen.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Pakketten behouden.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Annuleer het behouden van een pakket.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Pakketten aanduiden als automatisch geïnstalleerd.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Pakketten aanduiden als handmatig geïnstalleerd.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5366,17 +5356,17 @@ msgstr ""
 " forbid-version - Verbied aptitude van op te waarderen naar een specifieke "
 "pakketversie.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Lijsten van nieuwe/opwaardeerbare pakketten ophalen.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Een veilige opwaardering uitvoeren.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5386,52 +5376,52 @@ msgstr ""
 "worden\n"
 "                geïnstalleerd of verwijderd.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr "forget-new   - Vergeet welke pakketten \"nieuw\" zijn.\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Een pakket opzoeken op naam en/of op expressie.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Gedetailleerde informatie tonen van een pakket.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Gedetailleerde informatie tonen van een pakket\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Opgehaalde pakketbestanden wissen.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Oude opgehaalde pakketbestanden wissen.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Bekijk de changelog van een pakket.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Het .deb-bestand van een pakket ophalen.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5440,7 +5430,7 @@ msgstr ""
 " reinstall    - Download en herinstalleer (mogelijk) een momenteel\n"
 "                geïnstalleerd pakket.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5452,7 +5442,7 @@ msgstr ""
 "pakket\n"
 "                nodig zouden hebben.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5465,56 +5455,56 @@ msgstr ""
 "                pakketten zouden leiden tot een conflict met het opgegeven\n"
 "                pakket indien geïnstalleerd.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opties:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Deze helptekst.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Deze helptekst\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Acties simuleren, maar ze niet werkelijk uitvoeren\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Enkel pakketten ophalen, niets installeren of verwijderen.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr "-P             Steeds naar bevestiging of actie vragen.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, fuzzy, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5522,7 +5512,7 @@ msgstr ""
 " -y             Veronderstel dat het antwoord op eenvoudige ja/nee-vragen "
 "'ja' is\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5531,7 +5521,7 @@ msgstr ""
 " -F indeling      Een indeling aangeven voor de zoekresultaten; zie "
 "handleiding.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5541,25 +5531,25 @@ msgstr ""
 "zie\n"
 "                   handleiding.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr ""
 " -w breedte       Geeft de breedte aan voor weergave van zoekresultaten.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Probeert reparaties van defecte pakketten te forceren\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Toont welke versies van pakketten geïnstalleerd zijn\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -5567,13 +5557,13 @@ msgstr ""
 " -D             Toont de afhankelijkheden van automatisch gewijzigde "
 "pakketten\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 " -Z             Toont de wijziging in installatiegrootte van elk pakket\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5582,7 +5572,7 @@ msgstr ""
 " -v             Toont extra informatie. (kan meerdere keren worden "
 "meegegeven).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
@@ -5590,7 +5580,7 @@ msgstr ""
 " -t [release]   Zet de release waarvan pakketten moeten geïnstalleerd "
 "worden.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5600,13 +5590,13 @@ msgstr ""
 "voortgangs-\n"
 "                indicatoren.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o sleutel=val Zet de configuratie-optie genaamd 'sleutel' rechtstreeks.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5615,160 +5605,140 @@ msgstr ""
 " --with(out)-recommends\tspecifieert of recommends al dan niet als sterke\n"
 "                afhankelijkheden worden behandeld.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fnaam       Lees de uitgebreide statusinfo van aptitude uit fnaam.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Haal bij het opstarten nieuwe pakketlijsten op.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr ""
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Voer bij het opstarten een installatieslag uit.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Deze aptitude heeft geen Super Koe-krachten.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 msgid "trace"
 msgstr "waar"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 msgid "info"
 msgstr "nee"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 msgid "error"
 msgstr "Fout "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "onwaar"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Ongeldige operatie %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Verwachtte een getal na -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Verwachtte een getal na -q=, got %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o vereist een argument in de vorm sleutel=waarde, kreeg %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Ontbrekende komma na labelnaam \"%s\".\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "BIZAR: onbekende optiecode meegekregen\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "Pakket"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "Alle Pakketten"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5776,38 +5746,33 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Er mag slechts één van -u of -i meegegeven worden.\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u en -i mogen niet meegegeven worden in commandoregelmodus (zoals bij "
 "'install')"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u en -i mogen niet meegegeven worden met een commando"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Onbekend commando \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Onbekend commando \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Niet opgevangen uitzondering: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5825,7 +5790,7 @@ msgstr "Zoek naar: "
 msgid "Search backwards for: "
 msgstr "Zoek achterwaarts naar: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Mijnenveger"
 
@@ -6037,7 +6002,7 @@ msgstr "Codering van mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 20 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Pakket"
 
@@ -6118,8 +6083,8 @@ msgstr "<NVT>"
 msgid "<none>"
 msgstr "<geen>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtueel"
@@ -6253,7 +6218,7 @@ msgstr "Kan pakketweergave niet transcoderen vanaf \"%ls\""
 msgid "Internal error: Default column string is unparsable"
 msgstr "Interne fout: standaard kolomstring is niet ontleedbaar"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Taken"
 
@@ -6412,11 +6377,11 @@ msgstr "Overeenkomstindicators moeten groter of gelijk zijn aan 1, niet \"%s\""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "Overeenkomstindicator %ls is te groot; aanwezige groepen zijn (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PAKKETTEN ZONDER LABELS"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6427,10 +6392,6 @@ msgstr ""
 "database is niet beschikbaar (installatie van debtags kan dit mogelijk "
 "verhelpen)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "ONTBREKEND LABEL"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Bronpakket: "
@@ -7058,7 +7019,7 @@ msgstr "Laden van cache"
 msgid "Really quit Aptitude?"
 msgstr "Aptitude echt afsluiten?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Wijzig de werking van aptitude"
 
@@ -7138,7 +7099,7 @@ msgstr ""
 msgid "License"
 msgstr "Licentie"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 "Bekijk de voorwaarden waaronder u aptitude mag kopiëren en distribueren"
@@ -7160,7 +7121,7 @@ msgstr "On-line Hulp"
 msgid "View a brief introduction to aptitude"
 msgstr "Bekijk een korte introductie van aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Help"
 
@@ -7189,7 +7150,7 @@ msgstr "Handmatig"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Bekijk een overzicht van veel gestelde vragen"
 
@@ -7232,15 +7193,15 @@ msgstr ""
 "verwijderen. %n%nWilt u deze map en heel de inhoud verwijderen? Als u \"Nee"
 "\" selecteert, dan zult u deze boodschap niet meer zien."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Bekijk de voortgang van het afhalen van het pakket"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Pakket Downloaden"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7252,35 +7213,35 @@ msgstr ""
 "van uw systeem compromiteren%b. Ga enkel verder met de installatie als u "
 "zeker bent dat u dat wilt.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versie %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Werkelijk verdergaan"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Breek installatie af"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Preview van de pakketinstallatie."
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Bekijk en/of wijzig de acties die zullen worden uitgevoerd"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Enkele pakketten waren defect en zijn gerepareerd:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Er bestaat geen oplossing voor deze afhankelijkheidsproblemen!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7289,7 +7250,7 @@ msgstr ""
 "Tijd verloren bij het proberen van afhankelijkheden op te lossen (druk \"%s"
 "\" om harder te proberen)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7297,21 +7258,21 @@ msgstr ""
 "Installeren/verwijderen van pakketten vereist administratieve privileges, "
 "die u momenteel niet heeft. Wenst u te wijzigen naar de root-account?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Word root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Word geen root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "Er zijn geen pakketten gepland voor installatie, opwaardering of "
 "verwijdering."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7321,19 +7282,19 @@ msgstr ""
 "Enkele pakketten kunnen worden opgewaardeerd, maar u hebt niet gekozen om ze "
 "op te waarderen. Typ \"U\" om een opwaardering voor te bereiden."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Bijwerken van pakketlijsten"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Bekijk de voortgang van de bijwerking van de pakketlijst"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Lijst Bijwerken"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7341,23 +7302,23 @@ msgstr ""
 "Bijwerken van pakketlijsten vereist administratieve privileges, die u "
 "momenteel niet heeft. Wenst u te wijzigen naar de root-account?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Tijd verliezen bij het proberen vinden van mijnen"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Opschonen terwijl een download bezig is, is niet toegestaan."
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Opgehaalde bestanden verwijderen"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Opgehaalde pakketbestanden zijn verwijderd"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7366,11 +7327,11 @@ msgstr ""
 "Bijwerken van pakketlijsten vereist administratieve privileges, die u "
 "momenteel niet heeft. Wenst u te wijzigen naar de root-account?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "De apt-cache is niet beschikbaar; kan auto-clean niet uitvoeren."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7379,7 +7340,7 @@ msgstr ""
 "Verouderde opgehaalde pakketbestanden zijn verwijderd, %sB schijfruimte is "
 "vrijgemaakt."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7388,123 +7349,123 @@ msgstr ""
 "Bijwerken van pakketlijsten vereist administratieve privileges, die u "
 "momenteel niet heeft. Wenst u te wijzigen naar de root-account?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Geen oplossingen meer."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Niet mogelijk om een oplossing te vinden om toe te passen."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Teveel tijd nodig om een oplossing te vinden."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Afhankelijkheden Oplossen"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Zoek oplossingen voor niet nagekomen afhankelijkheden"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Kan %ls niet openen"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Fout bij het archiveren van de status van de oplosser"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Installeer/verwijder pakketten"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Werk pakketlijst bij"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Markeer ^opwaardeerbaar"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "Vergeet ^nieuwe pakketten"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Annuleer ^lopende acties"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "Schoon ^pakketcache"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "^Schoon veroudere bestanden"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Herlaad pakketcache"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "Speel ^Mijnenveger"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Word ^root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Afsluiten"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Installeer"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Markeer het geselecteerde pakket voor installatie of opwaardering"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Verwijder"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Markeer het geselecteerde pakket voor verwijdering"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Wis (purge)"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Markeer het geselecteerde pakket en zijn configuratiebestanden voor "
 "verwijdering"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Behoud"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Annuleer alle acties voor het geselecteerde pakket"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "Bevrie^s"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7512,11 +7473,11 @@ msgstr ""
 "Annuleer alle acties voor het geselecteerde pakket en bescherm het voor "
 "toekomstige opwaarderingen"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Markeer ^Automatisch"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7525,11 +7486,11 @@ msgstr ""
 "automatisch worden verwijderd als er geen andere pakketten meer van "
 "afhankelijk zijn"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Markeer ^Handmatig"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7537,11 +7498,11 @@ msgstr ""
 "Markeer het geselecteerde pakket als handmatig geïnstalleerd; het zal niet "
 "worden verwijderd tenzij u het handmatig verwijdert"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "V^erbied Versie"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7549,19 +7510,19 @@ msgstr ""
 "Verbied de installatie van de kandidaat versie van het geselecteerde pakket; "
 "nieuwere versies van het pakket zullen normaal worden geïnstalleerd"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformatie"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Toon aanvullende informatie over het geselecteerde pakket"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "^Wissel pakketinformatie"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7572,96 +7533,96 @@ msgstr ""
 "samenvatting van afhankelijkheidsinformatie, of een analyse waarom het "
 "pakket vereist is."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Toon de Debian-changelog van het geselecteerde pakket"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Bestudeer Oplossing"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 "Bestudeer de momenteel geselecteerde oplossing voor de "
 "afhankelijkheidsproblemen"
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "^Aanvaard Oplossing"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Voer de acties behorend bij de momenteel geselecteerde oplossing uit"
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Volgende Oplossing"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Selecteer de volgende oplossing voor de afhankelijkheidsproblemen"
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "V^orige Oplossing"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Selecteer de vorige oplossing voor de afhankelijkheidsproblemen"
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^Eerste Oplossing"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Selecteer de eerste oplossing voor de afhankelijkheidsproblemen"
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "^Laatste Oplossing"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr ""
 "Selecteer de voorlopig laatste oplossing voor de afhankelijkheidsproblemen"
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Schakel Ver^worpen"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Schakel of de op dit moment geselecteerde actie is verworpen"
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Schakel ^Goedgekeurd"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Schakel of de op dit moment geselecteerde actie is goedgekeurd"
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "Be^kijk Bestemming"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Bekijk het pakket dat zal worden aangetast door de geselecteerde actie"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Be^houden pakketten niet breken"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7669,137 +7630,137 @@ msgstr ""
 "Verwerp elke actie die zou leiden tot wijzging van de status van behouden "
 "pakketten of de installatie van verboden versies"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Zoek"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Zoek voorwaarts"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "Zoek ^Achterwaarts"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Zoek achterwaarts"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Zoek ^Opnieuw"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Herhaal de laatste zoekopdracht"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Zoek Opniew Achter^waarts"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Herhaal de laatste zoekopdracht in tegengestelde richting"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Beperk Weergave"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Pas een filter toe op de pakketlijst"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "Annuleer Be^perking Weergave"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Verwijder de filter van de pakketlijst"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Zoek ^Defecte"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Zoek het volgende pakket met niet-voldane afhankelijkheden"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Voorkeursinstellingen"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^Interface-opties"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Wijzig de instellingen met betrekking tot de gebruikersinterface"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Afhankelijkheidsafhandeling"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Wijzig de instellingen die bepalen hoe pakketafhankelijkheden worden "
 "behandeld"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Overige instellingen"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Wijzig overige programma-instellingen"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Herstel Opties"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Herstel alle instellingen naar de systeemstandaard"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Volgende"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Bekijk volgende weergave"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "V^orige"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Bekijk vorige weergave"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Sluit"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Sluit deze weergave"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Nieuwe ^Pakketweergave"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Maak een nieuwe standaard pakketweergave"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Onderzoek ^Aanbevelingen"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7807,87 +7768,87 @@ msgstr ""
 "Bekijk de pakketten die aanbevolen worden om te installeren, maar die "
 "momenteel niet geïnstalleerd zijn"
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "^Nieuwe Platte Pakketlijst"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Bekijk alle pakketten op het systeem in één lijst zonder categorieën"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Nieuwe ^Debtags-Bladeraar"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Doorblader pakketten op basis van Debtags-gegevens"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Nieuwe ^Categorische Bladeraar"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Doorblader pakketten per categorie"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Over"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Bekijk informatie over dit programma"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Help"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Bekijk de online help"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Gebruikershandleiding"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Bekijk de gedetailleerde programmahandleiding"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Nieuws"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Overzicht van belangrijke wijzigingen in elke versie van "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licentie"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Acties"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Zoek"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Opties"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Views"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7896,11 +7857,11 @@ msgstr ""
 "%ls: Menu  %ls: Help  %ls: Afsluiten  %ls: Bijwerken  %ls: Ophalen/Inst./"
 "Verw. Pakketten"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "ja-toets"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "nee-toets"
 
@@ -7928,9 +7889,39 @@ msgstr "Te gebruiken URL voor het ophalen van changelogs"
 msgid "Downloading the changelog of %s"
 msgstr "Changelog wordt opgehaald"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "U kunt alleen changelogs van officiële Debian-pakketten bekijken."
+#~ msgid "MISSING TAG"
+#~ msgstr "ONTBREKEND LABEL"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "Te gebruiken URL voor het ophalen van changelogs"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr "%s is geen officieel Debian-pakket, kan zijn changelog niet tonen."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Kan geen pakket vinden met als naam \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Kan patroon %s niet ontleden"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Verwachtte een getal na -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Verwachtte een getal na -q=, got %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o vereist een argument in de vorm sleutel=waarde, kreeg %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "BIZAR: onbekende optiecode meegekregen\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u en -i mogen niet meegegeven worden met een commando"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "U kunt alleen changelogs van officiële Debian-pakketten bekijken."
 
 #~ msgid "Err "
 #~ msgstr "Fout "
@@ -8105,11 +8096,6 @@ msgstr "U kunt alleen changelogs van officiële Debian-pakketten bekijken."
 #~ msgstr "Changelog wordt opgehaald"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Geen oplossing gevonden."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Kan pakkethiërarchiebestand %s niet openen"
diff --git a/po/nn.gmo b/po/nn.gmo
index 9ef70da9..e78f4568 100644
--- a/po/nn.gmo
+++ b/po/nn.gmo
diff --git a/po/nn.po b/po/nn.po
index 4368364b..efdaada5 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude_nn\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-05-23 10:12+0800\n"
 "Last-Translator: HÃ¥vard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -314,68 +314,57 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "Nettadresse som endringsloggar skal hentast frå"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Førehandsvis kva som vil bli gjort før det blir gjort"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Gløym kva for pakkar som er «nye» når pakkelistene vert oppdatert"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Gløym kva for pakkar som er «nye» når pakkar vert installert eller fjerna"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Gje åtvaring når ein vanleg brukar prøver å gjera noko som krev root-rettar"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -383,11 +372,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Fil som handlingar skal loggast i"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -395,11 +384,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Finn automatisk kva for andre pakkar ein pakke krev når han vert valt"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -407,12 +396,12 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Reparer automatisk øydelagde pakkar før installasjon eller fjerning av pakkar"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -420,12 +409,12 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 #, fuzzy
 msgid "Install recommended packages automatically"
 msgstr "Installer tilrådde pakkar automatisk"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -436,11 +425,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Fjern ubrukte pakkar automatisk"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -451,22 +440,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -479,17 +468,17 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 #, fuzzy
 msgid "UI options"
 msgstr "^Brukargrensesnitt"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 #, fuzzy
 msgid "Dependency handling"
 msgstr "^Handsaming av pakkekrav"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Ymse"
 
@@ -594,7 +583,7 @@ msgstr "Klarer ikkje finna eit arkiv «%s» for pakka «%s»\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Klarer ikkje opna %s"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -603,7 +592,7 @@ msgstr ""
 "Merk: «%s», tilbyr den virtuelle pakken\n"
 "      «%s», er allereie installert.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -612,7 +601,7 @@ msgstr ""
 "Merk: «%s», tilbyr den virtuelle pakken\n"
 "      «%s», skal allereie til å bli installert.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -621,17 +610,23 @@ msgstr ""
 "«%s» eksisterer i pakkedatabasen, men det er ikkje nokon\n"
 "verkeleg pakke og ingen pakkar gjev det.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "«%s» er ein virtuell pakke gjeven av:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Du må velja ein som skal installerast.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "Pakke %s er ikkje installert, kan ikkje forby oppgradering\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -640,60 +635,54 @@ msgstr ""
 "Merk: ved å velja «%s» istaden for\n"
 "      den virtuelle pakka «%s»\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s er allereie installert med den førespurde versjonen (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s er ikkje installert no, så han blir ikkje re-installert.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s er allereie installert med den førespurde versjonen (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s er ikkje installert no, så han blir ikkje re-installert.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Pakke %s er ikkje installert, så han blir ikkje fjerna\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pakke %s er ikkje installert, kan ikkje forby oppgradering\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Pakke %s kan ikkje oppgraderast, kan ikkje forby oppgradering\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Merk: vel oppgåva «%s: %s» for installasjon\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, fuzzy, c-format
+#: src/cmdline/cmdline_action.cc:501
+#, fuzzy
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr "Du kan berre oppgje ein pakkeversjon med «install»-kommandoen\n"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Du kan berre oppgje eit arkiv med «install»-kommandoen\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Du kan berre oppgje eit arkiv med «install»-kommandoen"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -702,7 +691,7 @@ msgstr ""
 "Klarte ikkje finna pakken «%s», og meir enn 40\n"
 "pakkar har «%s» i namnet sitt.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -711,14 +700,14 @@ msgstr ""
 "Klarte ikkje finna pakken «%s». Men desse pakkane\n"
 "har «%s» i namnet sitt:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Klarte ikkje finna nokon pakke som har eit namn eller ei skildring\n"
 "som passar med «%s»\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -736,7 +725,7 @@ msgstr ""
 "Klarte ikkje finna nokon pakke som passar med «%s». Men desse pakkane\n"
 "har «%s» i skildringa si:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Feil handlingsteikn «%c»\n"
@@ -759,29 +748,24 @@ msgstr "Feil "
 msgid "Changelog download failed: %s"
 msgstr "Endringslogg for %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "Klarer ikkje køyra fornuftig søkjing, er dette eit fungerande debiansystem?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "%s er ikkje ein offisiell debianpakke, kan ikkje visa endringsloggen."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Klarte ikkje finna endringslogg for %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "Klarte ikkje finna endringslogg for %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, fuzzy, c-format
-msgid "E: The clean command takes no arguments\n"
+#, fuzzy
+msgid "The clean command takes no arguments"
 msgstr "E: Oppdateringskommandoen tar ingen argument\n"
 
 #: src/cmdline/cmdline_clean.cc:66
@@ -789,69 +773,62 @@ msgstr "E: Oppdateringskommandoen tar ingen argument\n"
 msgid "Del %s* %spartial/*\n"
 msgstr "Slett %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr "Klarer ikkje opna %s"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Slett %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, fuzzy, c-format
-msgid "E: The autoclean command takes no arguments\n"
+#: src/cmdline/cmdline_clean.cc:127
+#, fuzzy
+msgid "The autoclean command takes no arguments"
 msgstr "E: Oppdateringskommandoen tar ingen argument\n"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Vil frigjeva %sB med diskplass\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Frigjorde %sB med diskplass\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ugyldig operasjon %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, fuzzy, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+#, fuzzy
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr "Klarer ikkje løysa pakkekrav."
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Avbryt.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "nedlasting: du må oppgje minste ein pakke for å lasta ned\n"
+msgid "download: you must specify at least one package to download"
+msgstr "nedlasting: du må oppgje minste ein pakke for å lasta ned"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Klarte ikkje lesa kjeldelista"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Klarte ikkje finna nokon pakke som har namnet «%s»"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -891,30 +868,22 @@ msgid "[Working]"
 msgstr " [Arbeider]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, fuzzy, c-format
-msgid "No such package \"%s\""
-msgstr "Kjeldepakke: "
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, fuzzy, c-format
-msgid "E: The forget-new command takes no arguments\n"
+#, fuzzy
+msgid "The forget-new command takes no arguments"
 msgstr "E: Oppdateringskommandoen tar ingen argument\n"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Vil gløyma kva for pakkar som er nye\n"
@@ -1027,17 +996,17 @@ msgstr "Desse pakkane vil bli oppgradert:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Desse pakkane vil bli oppgradert:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Desse VIKTIGE pakkane vil bli FJERNA!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Desse VIKTIGE pakkane vil bli ØYDELAGT med denne handlinga:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1047,16 +1016,16 @@ msgstr ""
 "øydelagt!\n"
 "          IKKJE hald fram dersom du ikkje veit NØYAKTIG kva du gjer!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Eg er klar over at dette er ein svært dårleg ide"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "For å halda fram, skriv inn teksten «%s»:\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1073,14 +1042,14 @@ msgstr ""
 "sikker på at du vil gjere dette.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  %s::CmdLine::Ignore-Trust-Violations is 'true'!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1091,7 +1060,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1100,138 +1069,138 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Vil du oversjå denne åtvaringa og halda fram likevel?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "For å halda fram, skriv «%s»; for å avbryte, skriv «%s»: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Teksten er ikkje gjenkjent. Skriv anten «%s» eller «%s».\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Desse pakkane er FØRESLÅTT men vil IKKJE bli installert:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Desse pakkane er FØRESLÅTT men blir IKKJE installert:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Ingen pakkar vil bli installert, oppgradert eller fjerna.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pakkar oppgradert, %lu nyleg installert, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installert på ny, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Treng å henta %sB/%sB med installasjonspakkar. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Treng å henta %sB med installasjonspakkar. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Etter utpakking vil %sB vli brukt.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Etter utpakking vil %sB bli frigjort.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Ingen pakkar å vise -- oppgje pakkenamna på linja etter «i».\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Trykk Enter for å halda fram."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Fann ingen pakkar -- oppgje pakkenamna på linja etter «c».\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "hald fram med installasjonen"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "avbryt og avslutt"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr ""
 "Vis informasjon om ein eller fleire pakkar. Pakkenamna skal kome etter i-en."
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1239,63 +1208,63 @@ msgstr ""
 "Vis debianendringsloggen for ein eller fleire pakkar. Pakkenamnet må "
 "etterfølgje c-en."
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "slå av eller på visinga av pakkekravinformasjon"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "Slå av på visinga av endring i pakkestorleikar"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "Slå av eller på vising av versjonsnummer"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "skriv inn heile det visuelle grensesnittet"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1307,48 +1276,48 @@ msgstr ""
 "pakkenamn (eller mønster). Handlinga vil bli utført på alle pakkane du "
 "listar opp. Desse handlingane er tilgjengelege:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "+ for å installere pakkar"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "+M for å installere pakkar og merkje dei med det same som automatisk "
 "installerte"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "- for å fjerne pakkar"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "_ for å reinske ut pakkar"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "= for å leggje pakkar på hald"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 ": for å la pakkar vere i deira noverande tilstand utan å leggje dei på hald"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "&M for å merkje pakkar som automatisk installerte"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "&m for å merkje pakkar som manuelt installerte"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1356,53 +1325,53 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "&M for å merkje pakkar som automatisk installerte"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Kommandoar:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Vil du halda fram? [J/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Ugyldig respons. Skriv inn ein gyldig kommando eller «?» for hjelp.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1413,7 +1382,7 @@ msgstr ""
 "Informasjon om pakkekrav vil bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1424,7 +1393,7 @@ msgstr ""
 "Informasjon om pakkekrav vil ikkje bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1435,7 +1404,7 @@ msgstr ""
 "Versjonar vil bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1446,7 +1415,7 @@ msgstr ""
 "Versjonar vil ikkje bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1457,7 +1426,7 @@ msgstr ""
 "Storleiksendringar vil bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1583,6 +1552,11 @@ msgstr ""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Klarer ikkje opna %s"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, fuzzy, c-format
+msgid "No such package \"%s\""
+msgstr "Kjeldepakke: "
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1729,7 +1703,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 #, fuzzy
@@ -1759,7 +1733,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Desse kommandoane er tilgjengelege:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Fil for å skrive løysingstilstanden i: "
 
@@ -1790,7 +1764,7 @@ msgid ""
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1799,25 +1773,24 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Klarer ikkje løyse pakkekrava! Gjev opp ..."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Klarer ikkje løysa pakkekrav."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
+msgid "iconv of %s failed"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "søk: Du må oppgje iallefall eitt søkje ord\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "søk: Du må oppgje iallefall eitt søkje ord"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1860,7 +1833,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Desse pakkane hadde utilfredsstilte pakkekrav:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2083,7 +2056,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Skaffar"
 
@@ -2097,15 +2070,9 @@ msgstr "Skildring: "
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:582
-#, fuzzy, c-format
-msgid "Unable to locate package %s"
-msgstr "Klarer ikkje opna %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, fuzzy, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Klarer ikkje opna %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Fann ingen pakkar"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2116,14 +2083,13 @@ msgstr "Vil lasta ned, installera og/eller fjerna pakkar.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Intern feil, tinging blei ikkje ferdig"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Slettar nedlasta filer som er forelda"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: Oppdateringskommandoen tar ingen argument\n"
+msgid "The update command takes no arguments"
+msgstr "Oppdateringskommandoen tar ingen argument"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, fuzzy, c-format
@@ -2140,132 +2106,154 @@ msgstr "Klarer ikkje finna nokon versjon «%s» for pakka «%s»\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Ingen versjonskandidat funnen for %s\n"
+msgid "No candidate version found for %s"
+msgstr "Ingen versjonskandidat funnen for %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, fuzzy, c-format
-msgid "No current or candidate version found for %s\n"
+msgid "No current or candidate version found for %s"
 msgstr "Ingen versjonskandidat funnen for %s\n"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Klarer ikkje finna eit arkiv «%s» for pakka «%s»\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Klarer ikkje finna eit arkiv «%s» for pakka «%s»"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Klarer ikkje finna nokon versjon «%s» for pakka «%s»\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Klarer ikkje finna nokon versjon «%s» for pakka «%s»"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Intern feil: ugyldig verdi %i blei sendt til cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Intern feil: ugyldig verdi %i blei sendt til cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Du kan ikkje oppgje både eit arkiv og ein versjon for ein pakke\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Du kan ikkje oppgje både eit arkiv og ein versjon for ein pakke"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Klarte ikkje finna endringslogg for %s"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, fuzzy, c-format
+msgid "Unable to locate package %s"
+msgstr "Klarer ikkje opna %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Klarte ikkje finna endringslogg for %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Merk: vel oppgåva «%s: %s» for installasjon\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Klarte ikkje finna endringslogg for %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Pakkar"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Kjeldepakke: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "Arkiv"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "søk: Du må oppgje iallefall eitt søkje ord\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2291,7 +2279,7 @@ msgstr ""
 msgid "Candidate"
 msgstr "Kdt.Ver"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 #, fuzzy
 msgid "Install"
 msgstr "^Installer"
@@ -2396,21 +2384,19 @@ msgstr "Klarer ikkje å finne ei løysing som kan brukast."
 msgid "Packages requiring %s:"
 msgstr "Pakkar som krev %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, fuzzy, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Klarte ikkje finna nokon pakke som har namnet «%s»"
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 #, fuzzy
 msgid "Unable to parse some match patterns."
 msgstr "Klarer ikkje opna %s"
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 
 #: src/cmdline/cmdline_why.h:212
@@ -2437,12 +2423,12 @@ msgstr "IKKJE TILFREDSSTILT"
 msgid "UNAVAILABLE"
 msgstr "IKKJE TILGJENGELEG"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 #, fuzzy
 msgid "Tags"
 msgstr "Merke"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 #, fuzzy
 msgid "User Tags"
 msgstr "Merke"
@@ -2643,31 +2629,31 @@ msgid ""
 "you make to the states of packages will NOT be preserved!"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "hovud"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2734,38 +2720,46 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 #, fuzzy
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr "Pakkemellomlageret er ikkje tilgjengeleg."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 "Intern feil: klarte ikkje generera liste over pakkar som skal lastast ned"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, fuzzy, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Klarer ikkje opna %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Klarte ikkje henta nokre av arkiva. Du kan prøva med «aptitude update» eller "
+"«--fix-missing»."
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Ikkje i stand til å retta opp for utilgjengelege pakkar"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 #, fuzzy
 msgid "A package failed to install.  Trying to recover:"
 msgstr ""
 "Uff! Noko gjekk gale under installasjonen av pakkar. Prøver å gjenskape."
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2918,13 +2912,13 @@ msgstr ""
 "\n"
 "Logg ferdig.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "Lastar ned pakkar"
@@ -3035,18 +3029,18 @@ msgid ""
 msgstr ""
 "Pakkeindeksfilene er øydelagde. Feltet «Filename:» manglar for pakken %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Endringslogg for %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "Nettadresse som endringsloggar skal hentast frå"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Nettadresse som endringsloggar skal hentast frå"
@@ -3096,26 +3090,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Klarer ikkje opna %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr ""
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "Ikkje installert"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "Ikkje installert"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3264,40 +3259,40 @@ msgstr ""
 msgid "_File"
 msgstr "Lukk"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Utfør installering og fjerning av pakkar"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Sjå etter nye versjonar av pakkar"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Marker alle pakkar som ikkje er haldt tilbake til oppgradering"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Gløym kva for pakkar som er «nye»"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 #, fuzzy
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "Utfør installering og fjerning av pakkar"
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Slett tidlegare nedlasta pakkefiler"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Slett pakkefiler som ikkje kan hentast lenger"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Lastar pakkelagert inn på ny"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3307,7 +3302,7 @@ msgstr ""
 "Køyrer «su» for å bli root. Dette vil starta programmet på ny, men "
 "instillingane vil bli tatt vare på."
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Avsluttar programmet"
 
@@ -3315,7 +3310,7 @@ msgstr "Avsluttar programmet"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Angrar den siste pakkehandlinga eller gruppe av handlingar"
 
@@ -3349,7 +3344,7 @@ msgid "_Help"
 msgstr "Hjelp"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3358,19 +3353,19 @@ msgstr ""
 msgid "Update"
 msgstr "Listeoppdatering"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Pakkar"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Førehandsvising"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 #, fuzzy
 msgid "Resolver"
 msgstr "^Fjern"
@@ -3556,7 +3551,7 @@ msgid "Fix Manually"
 msgstr "Merk ^Manuell"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 #, fuzzy
 msgid "Upgrade"
 msgstr "oppgrader"
@@ -4094,12 +4089,12 @@ msgstr "installert"
 msgid "Reinstall"
 msgstr "installer på ny"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 #, fuzzy
 msgid "Downgrade"
 msgstr "nedgradert"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 #, fuzzy
 msgid "Remove"
 msgstr "^Fjern"
@@ -4136,7 +4131,7 @@ msgstr "Bruk eit filter på pakkelista"
 msgid "Download already running."
 msgstr "Lastar ned ..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Ei oppdatering av pakkelista eller ei installering er allereie igang."
 
@@ -4197,38 +4192,38 @@ msgstr "- for å fjerne pakkar"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Klarer ikkje byta ut %s med ny oppsettsfil"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Lastar ned pakkar"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "- for å fjerne pakkar"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "- for å fjerne pakkar"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "Klarer ikkje løysa pakkekrav."
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Ingen pakkar er øydelagde."
 msgstr[1] "Ingen pakkar er øydelagde."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s endringar"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s endringar"
@@ -4236,7 +4231,7 @@ msgstr "%s endringar"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4246,66 +4241,66 @@ msgstr[1] "%d installeringar"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "Klarer ikkje opna %s"
 msgstr[1] "Klarer ikkje opna %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "Nedlast.Str"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "ikkje installert"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "installert"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "^Reinsk ut"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 #, fuzzy
 msgid "Keep"
 msgstr "^Ta vare på"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 #, fuzzy
 msgid "Hold"
 msgstr "^Hald tilbake"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "^Brukarvegleiing"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4343,7 +4338,7 @@ msgstr "ingen"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4388,17 +4383,17 @@ msgstr "%s; versjon %s vil bli installert automatisk"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "Søk"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "Byggjer vising"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Byggjer vising"
@@ -5114,117 +5109,118 @@ msgstr "Ukjent oppstillingstype «%s»"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Metode for sortering etter namn tar ingen argument"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Ugyldig nullengdenamn på sorteringsmetode"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Ubalansert «(» i skildring av sorteringsmetode"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Ugyldig type «%s» på sorteringsmetode"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr ""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s kompilert på %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompilator: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 #, fuzzy
 msgid "Compiled against:\n"
 msgstr "Kompilator: g++ %s\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr ""
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, fuzzy, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 "\n"
 "NCurses-versjon: %s\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, fuzzy, c-format
 msgid "  NCurses version %s\n"
 msgstr ""
 "\n"
 "NCurses-versjon: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, fuzzy, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "«libsigc++»-versjon: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr ""
 "\n"
 "Curses-versjon: %s\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr ""
 "\n"
 "Curses-versjon: %s\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s kompilert på %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:181
 #, fuzzy
 msgid ""
 "\n"
@@ -5233,36 +5229,36 @@ msgstr ""
 "\n"
 "Curses-versjon: %s\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, fuzzy, c-format
 msgid "  NCurses version: %s\n"
 msgstr ""
 "\n"
 "NCurses-versjon: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, fuzzy, c-format
 msgid "  cwidget version: %s\n"
 msgstr "«libsigc++»-versjon: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, fuzzy, c-format
 msgid "  Apt version: %s\n"
 msgstr ""
 "\n"
 "Curses-versjon: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Bruk: aptitude [-S fnamn] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [val] <handling> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5272,43 +5268,43 @@ msgstr ""
 "modus):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Installer/oppgrader pakkar.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Fjernar pakkar.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Fjernar pakkar og oppsettsfilene deira.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Legg pakkar på hald.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Fjern ein hald-kommando for ein pakke.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 " markauto     - Merk pakkar som at dei er blitt installert automatisk.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Merk pakkar som at dei er installert manuelt.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5316,17 +5312,17 @@ msgid ""
 msgstr ""
 " forby versjon - Forby aptitude å oppgradere til ein særskild pakkeversjon.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Last ned liste over nye/oppgraderbare pakkar.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, fuzzy, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " upgrade      - Utfør ei trygg oppgradering\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5335,59 +5331,59 @@ msgstr ""
 " full-upgrade - Utfør ei oppgradering, det kan vera pakkar blir installert\n"
 "                og fjerna.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Gløym kva for pakkar som er «nye».\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Søk etter ein pakke etter namn og/eller uttrykk.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Vis detaljert informasjon om ei pakke.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Vis detaljert informasjon om ei pakke\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Slett nedlasta pakkefiler.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Slett gamle nedlasta pakkefiler.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Vis endringsloggen til ein pakke.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Last ned .deb-fila for ein pakke.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
 msgstr ""
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, fuzzy, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5395,7 +5391,7 @@ msgid ""
 "                why one or more packages would require the given package.\n"
 msgstr " -Z\t\t    Vis endringane på installert storleik på kvar pakke.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, fuzzy, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5404,62 +5400,62 @@ msgid ""
 "                lead to a conflict with the given package if installed.\n"
 msgstr " -Z\t\t    Vis endringane på installert storleik på kvar pakke.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Val:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Denne hjelpeteksten.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Denne hjelpeteksten\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simuler handlingar, men ikkje utfør dei.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Berre lasta ned pakkar, ikkje installer eller fjern noko.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Spør alltid om stadfesting eller handlingar.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             Forutset at svaret på enkle ja/nei-spørsmål er «Ja».\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5468,7 +5464,7 @@ msgstr ""
 " -F format      Oppgje eit format for vising av søkjeresultat; sjå "
 "manualen.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5477,36 +5473,36 @@ msgstr ""
 " -O rekkjefølgje Oppgjev korleis eit søkjeresultat skal sorterast; sjå "
 "manualen.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr ""
 " -w breidde     Oppgje visingsbreidde for formatering av søkjeresultat.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Prøv hardt å reparere øydelagde pakkar.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Vis kva for versjonar av pakkar som skal installerast.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             Vis pakkekrava til automatisk endra pakkar.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Vis endringane på installert storleik på kvar pakke.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5514,26 +5510,26 @@ msgid ""
 msgstr ""
 " -v             Vis ekstra informasjon. (kan tilføyast fleire gongar).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 " -t [sleppversjon]  Set sleppversjonen som pakkar skal installerast frå.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr ""
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o nøkkel=verdi    Set direkte oppsettsvalet som heiter «nøkkel».\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5542,159 +5538,139 @@ msgstr ""
 " --with(out)-recommends\tOppgje om tilrådde og/eller føreslåtte pakkar skal\n"
 "                handterast som strenge pakkekrav.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S fnamn: Les den utvida statusinfo-fila for aptitude frå fnamn.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Last ned ny pakkeliste ved oppstart.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             Denne hjelpeteksten\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Utfør ei installasjonskøyring ved oppstart.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Denne aptituden har ikkje Super Cow Powers.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 msgid "trace"
 msgstr "erstattar"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 msgid "info"
 msgstr "ingen"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 msgid "error"
 msgstr "Feil "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "Lukk"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Ugyldig operasjon %s"
 
-#: src/main.cc:765
-#, fuzzy, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Klarer ikkje opna %s"
-
-#: src/main.cc:774
-#, fuzzy, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Klarer ikkje opna %s"
-
-#: src/main.cc:798
-#, fuzzy, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o krev eit argument på forma nøkkel=verdi, fekk %s"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "MERKJELEG: mottok ein ukjent valkode\n"
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "Pakke"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "Alle pakkar"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5702,37 +5678,32 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Berre ein av -u og -i kan oppgjevast\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u og -i kan ikkje oppgjevast i kommandolinjemodus (dvs, med «install»)"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u og -i kan ikkje oppgjevast med ein kommando"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Ukjent kommando «%s»\n"
+msgid "Unknown command \"%s\""
+msgstr "Ukjent kommando «%s»"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr ""
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5749,7 +5720,7 @@ msgstr "Søk etter: "
 msgid "Search backwards for: "
 msgstr "Søk etter: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Minesveiper"
 
@@ -5964,7 +5935,7 @@ msgstr ""
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 15 30 17 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Pakke"
 
@@ -6045,8 +6016,8 @@ msgstr "<I/T>"
 msgid "<none>"
 msgstr "<ingen>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtuell"
@@ -6181,7 +6152,7 @@ msgstr "Klarer ikkje opna %s"
 msgid "Internal error: Default column string is unparsable"
 msgstr "Intern feil: Standard kolonnestreng kan ikkje tolkast"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Oppgåvepakkar"
 
@@ -6337,21 +6308,17 @@ msgstr ""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr ""
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Kjeldepakke: "
@@ -6968,7 +6935,7 @@ msgstr "Lastar mellomlager"
 msgid "Really quit Aptitude?"
 msgstr "Vil du verkeleg avslutta Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -7054,7 +7021,7 @@ msgstr ""
 msgid "License"
 msgstr "^Lisens"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 #, fuzzy
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Vis vilkåra for å kopiera programmet"
@@ -7076,7 +7043,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Hjelp"
 
@@ -7108,7 +7075,7 @@ msgstr "Merk ^Manuell"
 msgid "FAQ"
 msgstr "^SOS"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Vis ei liste over spørsmål og svar"
 
@@ -7144,15 +7111,15 @@ msgid ""
 "not see this message again."
 msgstr ""
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Vis framgangen for nedlastinga av pakkar"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Pakkenedlasting"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7164,35 +7131,35 @@ msgstr ""
 "halda fram med installasjonen dersom du er sikker på at du vil gjere dette.%n"
 "%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versjon %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Vil du verkeleg halda fram"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Avbryt Installasjon"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Førehandsvising av pakkeinstallasjon"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Vis og/eller endra på handlingane som skal utførast"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Nokre pakkar var øydelagde og har blitt fiksa:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Inga løysing på desse pakkekrava finst!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7200,7 +7167,7 @@ msgid ""
 msgstr ""
 "Har brukt opp tida på å løyse pakkekrav (trykk «%s» for å prøve hardare)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7208,19 +7175,19 @@ msgstr ""
 "Ã… installera/fjerna pakkar krev at du har administrative rettar, noko du "
 "ikkje har no. Vil du byte til root-kontoen?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Bli root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Ikkje bli root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Ingen pakkar vil bli installert, oppgradert eller fjerna."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7230,19 +7197,19 @@ msgstr ""
 "oppgraderast, men du har ikkje valt at dei skulle oppgraderast. Tast «U» for "
 "å førebu oppgradering."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Oppdaterer pakkelister"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Vis framgangen for oppdateringa av pakkelista"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Listeoppdatering"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7250,23 +7217,23 @@ msgstr ""
 "Oppdatering av pakkelister krev administrative rettar, noko du ikkje har no. "
 "Vil du byte til root-kontoen?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Bruke tida på å finna miner"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Å vaske medan ei nedlasting held på er ikkje tillatt!"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Slettar nedlasta filer"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Nedlasta pakkefiler er blitt sletta"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7275,12 +7242,12 @@ msgstr ""
 "Oppdatering av pakkelister krev administrative rettar, noko du ikkje har no. "
 "Vil du byte til root-kontoen?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 #, fuzzy
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "Pakkemellomlageret er ikkje tilgjengeleg."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7289,7 +7256,7 @@ msgstr ""
 "Forelda nedlasta pakkefiler er blitt sletta og har frigjort %sB med "
 "diskplass."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7298,125 +7265,125 @@ msgstr ""
 "Oppdatering av pakkelister krev administrative rettar, noko du ikkje har no. "
 "Vil du byte til root-kontoen?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Ingen fleire løysingar."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Klarer ikkje å finne ei løysing som kan brukast."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Brukte opp tida på å finne ei løysing."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 #, fuzzy
 msgid "Resolve Dependencies"
 msgstr "Klarer ikkje løysa pakkekrav."
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 #, fuzzy
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Finn den neste pakken med pakkekrav som ikkje er tilfredsstilt"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Klarer ikkje opna %s"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Feil ved lagring av løysingstilstanden"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Installer/fjern pakkar"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Oppdater pakkeliste"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 #, fuzzy
 msgid "Mark Up^gradable"
 msgstr "Marker ^Oppgraderbare"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Gløym nye pakkar"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 #, fuzzy
 msgid "Canc^el pending actions"
 msgstr "Pakkar som krev %s"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Reinsk pakkemellomlageret"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Slett ^forelda filer"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Last inn igjen pakkemellomlageret"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Spel minesveipar"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Bli ^root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Avslutt"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Angra"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Installer"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Merkjer den valde pakke for installasjon eller oppgradering"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Fjern"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Merkjer den valde pakke for fjerning"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Reinsk ut"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Merkjer den valde pakken for fjerning av programfiler og oppsettsfiler"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Ta vare på"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Avbryt handlingane på den valde pakken"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Hald tilbake"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7424,11 +7391,11 @@ msgstr ""
 "Avbryt handlinar på den valde pakken og vernar han mot framtidige "
 "oppgraderingar."
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Merk ^Auto"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7436,11 +7403,11 @@ msgstr ""
 "Merk den valde pakken som om han er automatisk installert. Pakken vil "
 "automatisk bli fjerna viss ingen andre pakkar treng han."
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Merk ^Manuell"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7448,11 +7415,11 @@ msgstr ""
 "Merk den valde pakken som om han var manuelt installert. Pakken vil ikkje "
 "bli fjerna viss du ikkje fjernar han manuelt."
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Forby versjon"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7460,353 +7427,353 @@ msgstr ""
 "Forby denne versjonen av den valde pakken frå å bli installert.\n"
 "Nyare versjonar av pakken vil bli installert som vanleg"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformasjon"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Vis meir informasjon om den valde pakken"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Endringslogg"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Vis debianendringsloggen til den valde pakken"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr ""
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 #, fuzzy
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Inga løysing på desse pakkekrava finst!"
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr ""
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr ""
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 #, fuzzy
 msgid "^Next Solution"
 msgstr "Ingen fleire løysingar."
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 #, fuzzy
 msgid "Select the next solution to the dependency problems."
 msgstr "Inga løysing på desse pakkekrava finst!"
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 #, fuzzy
 msgid "^Previous Solution"
 msgstr "gå til førre løysing"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 #, fuzzy
 msgid "Select the previous solution to the dependency problems."
 msgstr "Inga løysing på desse pakkekrava finst!"
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 #, fuzzy
 msgid "^First Solution"
 msgstr "Ingen fleire løysingar."
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 #, fuzzy
 msgid "Select the first solution to the dependency problems."
 msgstr "Inga løysing på desse pakkekrava finst!"
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 #, fuzzy
 msgid "^Last Solution"
 msgstr "Ingen fleire løysingar."
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 #, fuzzy
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "Inga løysing på desse pakkekrava finst!"
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr ""
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr ""
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr ""
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 #, fuzzy
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Merkjer den valde pakke for fjerning"
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr ""
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr ""
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Finn"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 #, fuzzy
 msgid "Search forwards"
 msgstr "Søk etter:"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr ""
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 #, fuzzy
 msgid "Search backwards"
 msgstr "Søk etter: "
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Finn i^gjen"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Gjer opp igjen det siste søket"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 #, fuzzy
 msgid "Find Again ^Backwards"
 msgstr "Finn i^gjen"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 #, fuzzy
 msgid "Repeat the last search in the opposite direction"
 msgstr "Gjer opp igjen det siste søket"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Filtrer vising"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Bruk eit filter på pakkelista"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Avfiltrer vising"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Fjernar filteret frå pakkelista"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Finn ^Øydelagd"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Finn den neste pakken med pakkekrav som ikkje er tilfredsstilt"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 #, fuzzy
 msgid "^Preferences"
 msgstr "Forkrav"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^Brukargrensesnitt"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Endrar innstillingane for brukargrenseflata"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Handsaming av pakkekrav"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Endra innstillingar som påverkar handtering av pakkekrav"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Ymse"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Endra ymse programinnstillingar"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Tilbakestill innstillingar"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Stiller tilbake alle innstillingar til standardverdiar"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Neste"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Vis neste skjermbilete"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Førre"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Vis førre skjermbilete"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Lukk"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Lukk dette skjermbilete"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Ny pakke^vising"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Lag ei ny standard for pakkevising"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 #, fuzzy
 msgid "Audit ^Recommendations"
 msgstr "Tilrådingar"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr ""
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 #, fuzzy
 msgid "New ^Flat Package List"
 msgstr "Ny pakke^vising"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 #, fuzzy
 msgid "New ^Debtags Browser"
 msgstr "Ny ^katagorivising"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 #, fuzzy
 msgid "Browse packages using Debtags data"
 msgstr "Bla i pakkar etter kategori"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Ny ^katagorivising"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Bla i pakkar etter kategori"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Om"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Vis informasjon om dette programmet"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Hjelp"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Vis hjelp"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Brukarvegleiing"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Vis den detaljerte programmanualen"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^SOS"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 #, fuzzy
 msgid "^News"
 msgstr "Ny"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Vis dei viktige endringane som er gjort i kvar versjon av "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Lisens"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Handlingar"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Søk"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Val"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Visingar"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7815,11 +7782,11 @@ msgstr ""
 "%s: Meny  %s: Hjelp  %s: Avslutt  %s:Oppdater  %s: Lasta ned/Installer/"
 "Fjerna pakkar"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "j"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -7848,9 +7815,41 @@ msgstr "Nettadresse som endringsloggar skal hentast frå"
 msgid "Downloading the changelog of %s"
 msgstr "Lastar ned endringslogg"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Du kan berre lesa endringsloggar for offisielle debianpakkar."
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "Nettadresse som endringsloggar skal hentast frå"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s er ikkje ein offisiell debianpakke, kan ikkje visa endringsloggen."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Klarte ikkje finna nokon pakke som har namnet «%s»"
+
+#, fuzzy
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Klarer ikkje opna %s"
+
+#, fuzzy
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Klarer ikkje opna %s"
+
+#, fuzzy
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Klarer ikkje opna %s"
+
+#, fuzzy
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o krev eit argument på forma nøkkel=verdi, fekk %s"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "MERKJELEG: mottok ein ukjent valkode\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u og -i kan ikkje oppgjevast med ein kommando"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Du kan berre lesa endringsloggar for offisielle debianpakkar."
 
 #~ msgid "Err "
 #~ msgstr "Feil "
@@ -7962,11 +7961,6 @@ msgstr "Du kan berre lesa endringsloggar for offisielle debianpakkar."
 #~ msgstr "Lastar ned endringslogg"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Inga løysing funne."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Kan ikkje opna pakkehierarkifila %s"
diff --git a/po/pl.gmo b/po/pl.gmo
index 276b3581..043e6b90 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 2427e4b4..9f2d2ba0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude 0.4.11\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
-"PO-Revision-Date: 2012-06-03 12:28+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
+"PO-Revision-Date: 2012-06-08 15:38+0200\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
 "Language: pl\n"
@@ -373,24 +373,10 @@ msgstr ""
 "których nie można już pobrać z żadnego archiwum określonego w sources.list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL pobierania dzienników zmian"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Ta opcja określa wzór adresu używanego do pobierania dzienników zmian ze "
-"strony Debiana. Powinno używać się tej opcji tylko jeśli dzienniki zmian "
-"zostanÄ… przeniesione pod inny URL."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Wyświetlanie planowanych akcji przed ich przeprowadzeniem"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -399,12 +385,12 @@ msgstr ""
 "instalacji aptitude będzie wyświetlać podsumowanie akcji, które mają być "
 "przeprowadzone."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Usuwanie informacji o nowościach przy uaktualnianiu list pakietów"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -412,12 +398,12 @@ msgstr ""
 "Włączenie tej opcji powoduje, że aptitude będzie czyścić listę nowych "
 "pakietów po uaktualnieniu listy pakietów (np. po wciśnięciu 'u')."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Usuwanie informacji o nowościach przy instalacji/usuwaniu pakietów"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -427,12 +413,12 @@ msgstr ""
 "pakietów po zakończeniu przebiegu instalacji lub po instalacji/usunięciu "
 "pakietów z poziomu wiersza poleceń."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "Pominięcie ostrzeżenia po pierwszej zmianie w trybie tylko do odczytu"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -442,12 +428,12 @@ msgstr ""
 "po modyfikacji stanu pakietu gdy użytkownik nie ma uprawnień do wprowadzenia "
 "zmian w systemie."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Ostrzeżenie przed wykonywaniem akcji administracyjnych przez użytkownika"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -460,11 +446,11 @@ msgstr ""
 "dostępna opcja zalogowania się jako administrator i wykonania "
 "uprzywilejowanych akcji ze zmienionymi uprawnieniami."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Plik dziennika"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -477,12 +463,12 @@ msgstr ""
 "polecenie powłoki, które otrzyma wpisy dziennika na swoim standardowym "
 "wejściu."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr ""
 "Automatyczne uzupełnianie zależności pakietu zaznaczonego do instalacji"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -495,12 +481,12 @@ msgstr ""
 "zależności, ale może dawać nieoptymalne wyniki lub całkowicie zawieść w "
 "pewnych przypadkach."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Automatyczne poprawianie zależności przed instalacją/usuwaniem pakietów"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -512,11 +498,11 @@ msgstr ""
 "bieżącą sugestię mechanizmu rozwiązywania problemów. W przeciwnym wypadku "
 "aptitude będzie prosić o wskazanie rozwiązania dla niespełnionych zależności."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Automatyczna instalacja polecanych pakietów"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -534,11 +520,11 @@ msgstr ""
 "nieużywanych pakietów\", pakiety polecane przez zainstalowane pakiety nie "
 "będą automatycznie usuwane."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Automatyczne usuwanie nieużywanych pakietów"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -556,11 +542,11 @@ msgstr ""
 "polecanych pakietów\", pakiety zainstalowane automatycznie nie będą usuwane, "
 "o ile sÄ… polecane przez jakiekolwiek inne zainstalowane pakiety."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Pakiety, które nigdy nie powinny być automatycznie usuwane"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -570,12 +556,12 @@ msgstr ""
 "istniał zainstalowany pakiet od nich zależący: nigdy nie będą one brane pod "
 "uwagę przy usuwaniu jako pakiety nieużywane."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Rozwiązywanie zależności w sposób nieuwzględniający zatrzymań i zabronień"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -597,15 +583,15 @@ msgstr ""
 "pakietów podczas automatycznej instalacji zależności dla pakietu ostatnio "
 "zaznaczonego do instalacji lub aktualizacji."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Opcje interfejsu"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Zależności"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Różne"
 
@@ -714,7 +700,7 @@ msgstr "Nie można znaleźć pakietu źródłowego dla \"%s\".\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Nie można spełnić zależności czasu budowania: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -723,7 +709,7 @@ msgstr ""
 "Uwaga: Pakiet \"%s\", udostępniający wirtualny\n"
 "       pakiet \"%s\" jest już zainstalowany.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -732,7 +718,7 @@ msgstr ""
 "Uwaga: Instalacja pakietu \"%s\", udostępniającego\n"
 "       wirtualny pakiet \"%s\" jest już zaplanowana.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -741,17 +727,22 @@ msgstr ""
 "\"%s\" występuje w bazie pakietów ale nie jest pakietem\n"
 "ani nie jest udostępniany przez żaden pakiet.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" jest pakietem wirtualnym udostępnianym przez:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Do instalacji należy wybrać jeden z nich.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Pakiet %s nie ma kandydata do instalacji"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -760,17 +751,17 @@ msgstr ""
 "Uwaga: Wybrano pakiet \"%s\" zamiast\n"
 "       pakietu wirtualnego \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "Jest już zainstalowana żądana wersja pakietu \"%s\" (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "Pakiet %s nie jest zainstalowany, więc nie zostanie zaktualizowany.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
@@ -778,47 +769,40 @@ msgstr ""
 "Pakiet %s jest już zainstalowany w najnowszej wersji, więc nie zostanie "
 "zaktualizowany.\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 "Pakiet %s nie jest zainstalowany, więc nie zostanie ponownie zainstalowany.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Pakiet %s nie jest zainstalowany, więc nie zostanie usunięty.\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pakiet %s nie jest zainstalowany, nie można zabronić aktualizacji\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Pakiet %s nie ma uaktualnienia, nie można zabronić aktualizacji\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Uwaga: wybranie zadania \"%s: %s\" do instalacji\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Wersję pakietu można podać tylko przy poleceniu \"install\" lub \"forbid-"
-"version\".\n"
+"version\""
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Archiwum pakietu można podać tylko przy poleceniu \"install\"\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Archiwum pakietu można podać tylko przy poleceniu \"install\""
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -827,7 +811,7 @@ msgstr ""
 "Nie znaleziono pakietu \"%s\".\n"
 "Nazwy ponad 40 pakietów zawierają \"%s\".\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -836,12 +820,12 @@ msgstr ""
 "Nie znaleziono pakietu \"%s\".\n"
 "Następujące pakiety mają \"%s\" w nazwie:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Nie znaleziono pakietu, którego nazwa lub opis zawierałyby \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -859,7 +843,7 @@ msgstr ""
 "Nie znaleziono pakietu z \"%s\" w nazwie.\n"
 "Opisy następujących pakietów zawierają \"%s\":\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Nieznana akcja \"%c\"\n"
@@ -881,102 +865,84 @@ msgstr "BÅ‚Ä…d  "
 msgid "Changelog download failed: %s"
 msgstr "Pobieranie dziennika zmian nie powiodło się: %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Nie można uruchomić programu sensible-pager. Czyżby to nie był Debian?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s nie jest oficjalnym pakietem Debiana. Nie można wyświetlić dziennika "
-"zmian."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Nie znaleziono dziennika zmian pakietu %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
-#, fuzzy, c-format
+#: src/cmdline/cmdline_changelog.cc:345
+#, c-format
 msgid "Couldn't run pager %s"
-msgstr "Nie znaleziono dziennika zmian pakietu %s"
+msgstr "Nie można uruchomić programu przeglądającego %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: Polecenie clean nie przyjmuje parametrów\n"
+msgid "The clean command takes no arguments"
+msgstr "Polecenie clean nie przyjmuje parametrów"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Usuwanie %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
-#, fuzzy
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 msgid "Unable to lock the download directory"
-msgstr "Nie można ustalić katalogu domowego!"
+msgstr "Nie udało się zablokować katalogu pobierania"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Usuwanie %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: Polecenie autoclean nie przyjmuje parametrów\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Polecenie autoclean nie przyjmuje parametrów"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Zwolni siÄ™ %sB miejsca na dysku\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Zwolniło się %sB miejsca na dysku\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Błędna operacja '%s'"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Nieoczekiwany argument po \"keep-all\""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "Nie można bezpiecznie rozwiązać problemów z zależnościami, proszę spróbować "
-"uruchomić z opcją --full-resolver\n"
+"uruchomić z opcją --full-resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Przerwane.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "download: należy podać przynajmniej jeden pakiet do pobrania\n"
+msgid "download: you must specify at least one package to download"
+msgstr "download: należy podać przynajmniej jeden pakiet do pobrania"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Nie można odczytać listy źródeł"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Nie znaleziono pakietu \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1014,22 +980,14 @@ msgid "[Working]"
 msgstr "[Pracuje]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: wymagany przynajmniej jeden argument (nazwa\n"
-"katalogu, w którym będą zapisywane pliki).\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Brak pakietu \"%s\""
+"extract-cache-entries: wymagany przynajmniej jeden argument (nazwa katalogu, "
+"w którym będą zapisywane pliki)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
@@ -1037,11 +995,10 @@ msgstr ""
 "nic do zrobienia.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: Polecenie forget-new nie przyjmuje parametrów\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Polecenie forget-new nie przyjmuje parametrów"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Usunięto by informacje o nowościach\n"
@@ -1149,17 +1106,17 @@ msgstr "Następujące pakiety zostaną zaktualizowane:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Następujące częściowo zainstalowane pakiety zostaną skonfigurowane:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Następujące ISTOTNE pakiety zostaną USUNIĘTE!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Następujące ISTOTNE pakiet będą miały NIESPE�NIONE zależności:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1170,16 +1127,16 @@ msgstr ""
 
 # [pl_PL] było: "Zdaję sobie sprawę, że to bardzo zły pomysł", ale zostało
 # [pl_PL] zmienione aby umożliwić wpisanie tej frazy bez polskich znaków
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Wiem, rozumiem, to bardzo kiepski koncept"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Aby kontynuować napisz \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1195,7 +1152,7 @@ msgstr ""
 "Kontynuuj instalację tylko jeżeli dobrze wiesz co chcesz zrobić.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1204,7 +1161,7 @@ msgstr ""
 "*** UWAGA ***   Powyższe problemy zostaną zignorowane ponieważ parametr\n"
 "                %s::CmdLine::Ignore-Trust-Violations ma wartość 'true'!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1217,7 +1174,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr "Zignoruj ten komunikat i kontynuuj|Tak"
 
@@ -1226,99 +1183,99 @@ msgstr "Zignoruj ten komunikat i kontynuuj|Tak"
 #. 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr "Przerwij|Nie"
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Zignorować ostrzeżenie i kontynuować?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Aby kontynuować, napisz \"%s\", aby przerwać, napisz \"%s\": "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Odpowiedź nierozpoznana. Napisz \"%s\" lub \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Następujące pakiety POLECANE przez inne NIE zostaną zainstalowane:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Następujące pakiety SUGEROWANE przez inne NIE zostaną zainstalowane:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 "Nie zostaną zainstalowane, zaktualizowane ani usunięte żadne pakiety.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pakietów aktualizowanych, %lu instalowanych, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu ponownie instalowanych, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu cofanych, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu do usunięcia i %lu nieaktualizowanych.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Do pobrania %sB/%sB archiwów. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Do pobrania %sB archiwów. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Zajęte po rozpakowaniu: %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Zwolnione po rozpakowaniu: %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Brak pakietów do wyświetlenia -- po poleceniu \"i\" należy podać nazwy "
 "pakietów.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Wciśnij return."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Brak pakietów -- po poleceniu \"c\" należy podać nazwy pakietów.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1327,80 +1284,80 @@ msgstr ""
 "Brak pakietów -- należy podać zero lub więcej korzeni wyszukiwania oraz "
 "pakiet dla którego szukane jest uzasadnienie.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "t: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "kontynuacja instalacji"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "przerwanie instalacji, zakończenie programu"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr "wyświetlenie informacji o pakietach, ich nazwy należy podać po \"i\""
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
 msgstr ""
 "wyświetlenie dzienników zmian pakietów, ich nazwy należy podać po \"c\""
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "przełączenie pokazywania zależności"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "przełączenie pokazywania zmian rozmiarów pakietów"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "przełączenie pokazywania wersji"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1409,27 +1366,27 @@ msgstr ""
 "wyjaśnienia dlaczego instalacja jednego pakietu prowadzi do zainstalowania "
 "innego."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "uruchomienie automatycznego rozwiązywania problemów w celu uzupełnienia "
 "niespełnionych zależności."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "przejście do interfejsu pełnoekranowego"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1440,49 +1397,49 @@ msgstr ""
 "znak określający akcję, a po nim nazwy pakietów (lub wzorce). Akcja będzie "
 "dotyczyć wszystkich podanych pakietów. Dostępne są następujące akcje:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "\"+\": instalacja pakietów"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "\"+M\": instalacja pakietów i oznaczenie ich jako zainstalowanych "
 "automatycznie"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "\"-\": usunięcie pakietów"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "\"_\": wyczyszczenie pakietów"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "\"=\": zatrzymanie pakietów"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 "\":\": pozostawienie pakietów w bieżącym stanie bez trwałego zatrzymywania "
 "ich"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "\"&M\": oznaczenie pakietów jako automatycznie zainstalowanych"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "\"&m\": oznaczenie pakietów jako ręcznie zainstalowanych"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "\"&BD\": instalacja zależności na czas budowania dla pakietu."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1494,31 +1451,31 @@ msgstr ""
 "dodatkowa informacja o stanie pakietu i może zawierać dowolną kombinację z "
 "poniższych:"
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 msgid "'a': the package was automatically installed or removed."
 msgstr "\"a\": pakiet automatycznie zainstalowany lub usunięty."
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 "\"b\": niektóre z zależności pakietu są naruszone proponowanymi zmianami."
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 "\"p\": oprócz usunięcia pakietu zostaną również wyczyszczone pliki "
 "konfiguracyjne."
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr "\"u\": pakiet jest usuwany, ponieważ nie jest już używany."
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Polecenia:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1527,21 +1484,21 @@ msgstr ""
 "uzupełnić zależności ręcznie lub wpisać \"n\" aby wyjść."
 
 # Nie należy tłumaczyć Y na T! Patrz #495551.
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Kontynuować? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Uzupełnić te zależności ręcznie? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Nieprawidłowe polecenie. Proszę podać polecenie, lub \"?\" aby uzyskać "
 "pomoc.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1550,7 +1507,7 @@ msgstr ""
 "zainstalować pakiet), \"R\" aby spróbować automatycznie uzupełnić zależności "
 "lub \"N\" aby przerwać."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1561,7 +1518,7 @@ msgstr ""
 "Zależności będą pokazywane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1572,7 +1529,7 @@ msgstr ""
 "Zależności nie będą pokazywane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1583,7 +1540,7 @@ msgstr ""
 "Wersje będą pokazywane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1594,7 +1551,7 @@ msgstr ""
 "Wersje nie będą pokazywane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1605,7 +1562,7 @@ msgstr ""
 "Zmiany rozmiaru będą pokazywane.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1742,6 +1699,11 @@ msgstr "Po \"%c\" należy podać przynajmniej jeden pakiet i wersję"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Oczekiwano wersji lub \"%s\" po \"%s\""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Brak pakietu \"%s\""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1901,7 +1863,7 @@ msgstr ""
 "Chciano uzupełnić niespełnione zależności, ale rozwiązywanie zależności nie "
 "zostało właściwie przygotowane."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1930,7 +1892,7 @@ msgstr "Przejście z automatycznego rozwiązywania zależności do trybu ręczne
 msgid "The following commands are available:"
 msgstr "Dostępne są następujące polecenia:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Plik do zapisu stanu rozwiązywania problemów: "
 
@@ -1964,7 +1926,7 @@ msgstr ""
 "*** B�ĄD: wyszukiwanie przerwane przez krytyczny wyjątek. Można\n"
 "          kontynuować, ale niektóre rozwiązania będą niedostępne."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1977,26 +1939,25 @@ msgstr ""
 "  Można rozwiązać ten problem zwiększając\n"
 "  Aptitude::ProblemResolver::StepLimit (obecnie %d)."
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Nie można rozwiązać problemów z zależnościami tej aktualizacji: nie "
 "znaleziono rozwiÄ…zania."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Nie można rozwiązać problemów z zależnościami aktualizacji: %s."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "BÅ‚Ä…d \"iconv\" dla %s.\n"
+msgid "iconv of %s failed"
+msgstr "BÅ‚Ä…d \"iconv\" dla %s"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "search: Należy podać przynajmniej jedno wyrażenie do wyszukania\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "search: Należy podać przynajmniej jedno wyrażenie do wyszukania"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2039,7 +2000,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Następujące pakiety mają niespełnione zależności:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2177,7 +2138,7 @@ msgstr "nie"
 
 #: src/cmdline/cmdline_show.cc:421 src/pkg_info_screen.cc:125
 msgid "Multi-Arch: "
-msgstr ""
+msgstr "Wieloarchitekturowość: "
 
 #: src/cmdline/cmdline_show.cc:423 src/gtk/entitysummary.cc:361
 #: src/gtk/previewtab.cc:230
@@ -2262,7 +2223,7 @@ msgid "Enhances"
 msgstr "Rozszerza"
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Udostępnia"
 
@@ -2276,15 +2237,9 @@ msgstr "Opis: "
 msgid "Homepage: "
 msgstr "Strona internetowa: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nie można znaleźć pakietu %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Nie można przetworzyć wzorca %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Nie znaleziono żadnych pakietów"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2295,14 +2250,13 @@ msgstr "Pakiety zostałyby pobrane/zainstalowane/usunięte.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Błąd wewnętrzny. Sortowanie niezakończone."
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Usuwanie nieaktualnych pobranych plików"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: Polecenie update nie przyjmuje parametrów\n"
+msgid "The update command takes no arguments"
+msgstr "Polecenie update nie przyjmuje parametrów"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2320,43 +2274,37 @@ msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 "%s: za mało argumentów; oczekiwano przynajmniej nazwy znacznika i pakietu.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Brak kandydujÄ…cej wersji %s\n"
+msgid "No candidate version found for %s"
+msgstr "Brak kandydujÄ…cej wersji %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Brak aktualnej lub kandydujÄ…cej wersji %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "Brak aktualnej lub kandydujÄ…cej wersji %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Nie można znaleźć pakietu \"%2$s\" z archiwum \"%1$s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Nie można znaleźć pakietu \"%2$s\" z archiwum \"%1$s\""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Nie można znaleźć wersji \"%s\" pakietu \"%s\"\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Nie można znaleźć wersji \"%s\" pakietu \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
 msgstr ""
-"Błąd wewnętrzny: nieprawidłowa wartość %i przekazana do cmdline_find_ver!\n"
+"Błąd wewnętrzny: nieprawidłowa wartość %i przekazana do cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Nie można podawać jednocześnie archiwum i wersji pakietu\n"
-
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nie znaleziono dziennika zmian pakietu %s"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Nie można podawać jednocześnie archiwum i wersji pakietu"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
@@ -2364,7 +2312,7 @@ msgstr[0] "%d niespełniona zależność [%+d]"
 msgstr[1] "%d niespełnione zależności [%+d]"
 msgstr[2] "%d niespełnionych zależności [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
@@ -2372,7 +2320,7 @@ msgstr[0] "%d aktualizacja [%+d]"
 msgstr[1] "%d aktualizacje [%+d]"
 msgstr[2] "%d aktualizacji [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
@@ -2380,12 +2328,12 @@ msgstr[0] "%d nowy [%+d]"
 msgstr[1] "%d nowe [%+d]"
 msgstr[2] "%d nowych [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Bieżący status: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
@@ -2393,7 +2341,7 @@ msgstr[0] "Jest %d nowo zdezaktualizowany pakiet."
 msgstr[1] "SÄ… %d nowo zdezaktualizowane pakiety."
 msgstr[2] "Jest %d nowo zdezaktualizowanych pakietów."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
@@ -2401,49 +2349,77 @@ msgstr[0] "Jest %d nowo zdezaktualizowany pakiet: "
 msgstr[1] "SÄ… %d nowo zdezaktualizowane pakiety: "
 msgstr[2] "Jest %d nowo zdezaktualizowanych pakietów: "
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Brak kropki po nazwie znacznika \"%s\""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nie można znaleźć pakietu %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Nie udało się odnaleźć zadania \"%s\""
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Uwaga: wybranie zadania \"%s: %s\" do instalacji\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Nie znaleziono dziennika zmian pakietu %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, c-format
 msgid "Package %s:"
 msgstr "Pakiet %s:"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, c-format
 msgid "Source package %s:"
 msgstr "Pakiet źródłowy %s: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, c-format
 msgid "Archive %s:"
 msgstr "Archiwum %s:"
 
 # wszystkie tego typu opcje pozostawiono bez tłumaczenia, aby uniknąć problemów z kompatybilnością (zmiany w tłumaczeniu itp.)
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr "--group-by|archive"
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr "--group-by|auto"
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr "--group-by|none"
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr "--group-by|package"
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr "--group-by|source-package"
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr "--group-by|source-version"
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
@@ -2452,10 +2428,9 @@ msgstr ""
 "Nieprawidłowy tryb grupowania: %s\" (prawidłowe to: \"auto\", \"none\", "
 "\"package\" lub \"source-package\")"
 
-#: src/cmdline/cmdline_versions.cc:584
-#, c-format
-msgid "versions: You must provide at least one package selector\n"
-msgstr "versions: Należy wybrać co najmniej jeden pakiet\n"
+#: src/cmdline/cmdline_versions.cc:578
+msgid "versions: You must provide at least one package selector"
+msgstr "versions: Należy wybrać co najmniej jeden pakiet"
 
 #: src/cmdline/cmdline_why.cc:290
 msgid "dep_level"
@@ -2477,7 +2452,7 @@ msgstr "Bieżący"
 msgid "Candidate"
 msgstr "Kandydat"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Do instalacji"
 
@@ -2579,21 +2554,19 @@ msgstr "Nie można znaleźć uzasadnienia instalacji %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Pakiety wymagajÄ…ce %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Pakiet \"%s\" nie istnieje."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Nie można przetworzyć niektórych wzorców."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
-msgstr "%s: należy podać przynajmniej jeden argument (pakiet do wyszukania).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
+msgstr "%s: należy podać przynajmniej jeden argument (pakiet do wyszukania)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2619,11 +2592,11 @@ msgstr "NIESPE�NIONE"
 msgid "UNAVAILABLE"
 msgstr "NIEDOSTĘPNY"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Znaczniki"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Znaczniki użytkownika"
 
@@ -2828,34 +2801,33 @@ msgstr ""
 "uruchomiony dpkg lub inne narzędzie apt do instalowania pakietów. Otwieranie "
 "tylko do odczytu; wprowadzone zmiany stanu pakietów NIE będą zachowane!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
-msgstr ""
+msgstr "obca"
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
-msgstr ""
+msgstr "taka sama"
 
-#: src/generic/apt/apt.cc:1277
-#, fuzzy
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
-msgstr "dopuść_wybory"
+msgstr "dozwolona"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "main"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
-msgstr ""
+msgstr "contrib"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
-msgstr ""
+msgstr "non-free"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
-msgstr ""
+msgstr "non-US"
 
 #: src/generic/apt/aptitude_resolver.cc:441
 #, c-format
@@ -2932,36 +2904,44 @@ msgstr ""
 "Nieprawidłowy poziom bezpieczeństwa \"%s\" (nie \"discard\", \"maximum\", "
 "\"minimum\" lub liczba całkowita)."
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "Informacje o pakietach są niedostępne; nie można pobierać i instalować "
 "pakietów."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Błąd wewnętrzny: nie można utworzyć listy pakietów do pobrania"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Nie udało się pobrać %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
+msgstr "Nie udało się pobrać niektórych plików"
+
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
 msgstr ""
+"Nie udało się pobrać niektórych archiwów, proszę spróbować uruchomić "
+"aptitude update lub użyć opcji --fix-missing."
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Nie można naprawić braku pakietów"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "W czasie instalacji wystąpiły problemy. Próba naprawy:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2981,6 +2961,8 @@ msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"Nie udało się pobrać niektórych plików indeksu, zostały one zignorowane lub "
+"użyto ich starszej wersji."
 
 #: src/generic/apt/download_update_manager.cc:178
 msgid "Couldn't rebuild package cache"
@@ -3111,13 +3093,13 @@ msgstr ""
 "\n"
 "Dziennik zakończony.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr "Uzyskiwanie dostępu do indeksu"
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 msgid "Filtering packages"
 msgstr "Filtrowanie pakietów"
 
@@ -3127,9 +3109,9 @@ msgid "Unknown action type: %s"
 msgstr "Nieznana akcja: %s"
 
 #: src/generic/apt/matching/parse.cc:330
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown multiarch type: %s"
-msgstr "Nieznana akcja: %s"
+msgstr "Nieznany typ wieloarchitekturowości: %s"
 
 #: src/generic/apt/matching/parse.cc:370
 #, c-format
@@ -3228,18 +3210,18 @@ msgid ""
 msgstr ""
 "Pliki indeksu pakietów są uszkodzone. Brak pola \"Filename:\" pakietu %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Dziennik zmian pakietu %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "Nie udało się pobrać dzienników zmian: %s"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Nie udało się pobrać dzienników zmian: nieoczekiwany wyjątek."
 
@@ -3291,29 +3273,30 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nie można przetworzyć ciągu ustawień kosztów: %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Budowanie bazy znaczników"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr "przestarzały"
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 msgid "No tag descriptions are available."
 msgstr "Opisy znaczników są niedostępne."
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, c-format
 msgid "No description available for %s."
 msgstr "Opis dla %s jest niedostępny."
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr "przestarzały"
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
-msgstr ""
+msgstr "Nieobsługiwana metoda pakietów w zadaniu %s: %s"
 
 #: src/generic/apt/tasks.cc:484
 msgid "Reading task descriptions"
@@ -3457,51 +3440,46 @@ msgstr "Menedżer pakietów Aptitude"
 msgid "_File"
 msgstr "_Plik"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Przeprowadza zaplanowane instalacje/usunięcia"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Sprawdza dostępność nowszych wersji pakietów"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Zaznacza do aktualizacji wszystkie możliwe niezatrzymane pakiety"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Usuwa informacje o tym, które pakiety są nowe"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Anuluje wszystkie zaplanowane instalacje, usunięcia, wstrzymania i "
 "aktualizacje."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Usuwa wszystkie pobrane wcześniej pliki"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Usuwa pliki pakietów, które nie są dostępne do pobrania"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Ponownie odczytuje archiwum pakietów"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
-#, fuzzy
-#| msgid ""
-#| "Run 'su' to become root; this will restart the program, but your settings "
-#| "will be preserved"
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 msgid "Restart the program as root; your settings will be preserved"
 msgstr ""
-"Użycie \"su\" do uzyskania uprawnień administratora. Program zostanie "
-"zrestartowany, ale ustawienia będą zachowane"
+"Program zostanie uruchomiony ponownie jako root; ustawienia będą zachowane"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Kończy program"
 
@@ -3509,7 +3487,7 @@ msgstr "Kończy program"
 msgid "E_dit"
 msgstr "_Edycja"
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Cofa ostatniÄ… operacjÄ™ lub grupÄ™ operacji"
 
@@ -3541,7 +3519,7 @@ msgid "_Help"
 msgstr "P_omoc"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr "Tablica"
 
@@ -3549,19 +3527,19 @@ msgstr "Tablica"
 msgid "Update"
 msgstr "Uaktualnianie"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Pakiety"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "PrzeglÄ…d"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Zależności"
 
@@ -3739,7 +3717,7 @@ msgid "Fix Manually"
 msgstr "Napraw ręcznie"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Do aktualizacji"
 
@@ -4278,11 +4256,11 @@ msgstr "Zainstalowany"
 msgid "Reinstall"
 msgstr "Do ponownej instalacji"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Do cofnięcia"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Do usunięcia"
 
@@ -4315,7 +4293,7 @@ msgstr ""
 msgid "Download already running."
 msgstr "Pobieranie właśnie trwa."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Aktualizacja listy pakietów lub ich instalacja właśnie trwa."
 
@@ -4382,23 +4360,23 @@ msgstr "BÅ‚Ä…d w pakiecie %s"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Pytanie o zastÄ…pienie pliku konfiguracyjnego %s"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Pobieranie pakietów"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr "Pakiety z niespełnionymi zależnościami"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr "Pokaż pakiety z niespełnionymi zależnościami."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr "Rozwiązywanie zależności"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
@@ -4406,18 +4384,18 @@ msgstr[0] "%d pakiet z niespełnionymi zależnościami"
 msgstr[1] "%d pakiety z niespełnionymi zależnościami."
 msgstr[2] "%d pakietów z niespełnionymi zależnościami."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr "Zobacz zmiany"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr "Zatwierdź zmiany"
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4428,7 +4406,7 @@ msgstr[2] "%d pakietów do instalacji"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
@@ -4436,53 +4414,53 @@ msgstr[0] "%d pakiet do usunięcia"
 msgstr[1] "%d pakiety do usunięcia"
 msgstr[2] "%d pakietów do usunięcia"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr "Rozmiar pobierania: %sB."
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr "Znaczniki pakietu %s:\n"
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr "Ta funkcja nie została jeszcze wdrożona."
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr "Niewdrożone"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr "Zainstaluj/aktualizuj"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr "Wyczyść"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Do pozostawienia"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Do zatrzymania"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr "Ustaw jako automatycznie"
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr "Ustaw jako ręcznie"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr "Przełącz status automatyczny"
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4519,7 +4497,7 @@ msgstr "Informacja"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4563,15 +4541,15 @@ msgstr "%s jest instalowany ręcznie."
 msgid "Cache reloading, please wait..."
 msgstr "Przebudowa pamięci podręcznej, proszę czekać..."
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr "Wyszukiwanie..."
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr "Kończenie widoku"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Tworzenie widoku"
@@ -5198,9 +5176,8 @@ msgid "Terminal policy '%s' should be the last policy in the list"
 msgstr "Metoda \"%s\" powinna być ostatnia na liście"
 
 #: src/load_grouppolicy.cc:385
-#, fuzzy
 msgid "Unmatched '(' in grouping policy"
-msgstr "Niesparowany nawias \"(\" w definicji metody grupowania \"pattern\""
+msgstr "Niesparowany nawias \"(\" w definicji metody grupowania"
 
 #: src/load_grouppolicy.cc:413
 #, c-format
@@ -5217,17 +5194,17 @@ msgstr ""
 
 #: src/load_grouppolicy.cc:428 src/load_grouppolicy.cc:544
 #: src/load_grouppolicy.cc:621
-#, fuzzy, c-format
+#, c-format
 msgid "Too many arguments to '%s' grouping policy"
-msgstr "Zbyt wiele parametrów przy grupowaniu według źródła"
+msgstr "Zbyt wiele parametrów przy grupowaniu \"%s\""
 
 #: src/load_grouppolicy.cc:441 src/load_grouppolicy.cc:521
 #: src/load_grouppolicy.cc:532 src/load_grouppolicy.cc:555
 #: src/load_grouppolicy.cc:566 src/load_grouppolicy.cc:577
 #: src/load_grouppolicy.cc:608 src/load_grouppolicy.cc:766
-#, fuzzy, c-format
+#, c-format
 msgid "Grouping policy '%s' takes no arguments"
-msgstr "Przy grupowaniu zadań nie używa się żadnych parametrów"
+msgstr "Grupowanie \"%s\" nie przyjmuje argumentów"
 
 #: src/load_grouppolicy.cc:460 src/load_grouppolicy.cc:636
 #, c-format
@@ -5246,9 +5223,9 @@ msgstr ""
 "\""
 
 #: src/load_grouppolicy.cc:644
-#, fuzzy, c-format
+#, c-format
 msgid "Missing arguments to '%s' grouping policy"
-msgstr "Zbyt wiele parametrów przy grupowaniu według źródła"
+msgstr "Brakuje parametrów przy grupowaniu \"%s\""
 
 #: src/load_grouppolicy.cc:667
 #, c-format
@@ -5267,9 +5244,9 @@ msgstr ""
 "Oczekiwano \"{\", \")\" lub \",\" poprzedzanego przez '||', otrzymano '%s'"
 
 #: src/load_grouppolicy.cc:750
-#, fuzzy, c-format
+#, c-format
 msgid "Unmatched '(' in '%s' grouping policy"
-msgstr "Niesparowany nawias \"(\" w definicji metody grupowania \"pattern\""
+msgstr "Niesparowany nawias \"(\" w definicji metody grupowania \"%s\""
 
 #: src/load_pkgview.cc:64
 msgid "Couldn't parse layout: No column format specified for static item"
@@ -5305,108 +5282,109 @@ msgstr "Nieznany rodzaj wyrównania \"%s\""
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
-#, fuzzy, c-format
+#: src/load_sortpolicy.cc:104
+#, c-format
 msgid "Sorting policy '%s' takes no arguments"
-msgstr "Przy sortowaniu według nazwy nie używa się żadnych parametrów"
+msgstr "Przy sortowaniu \"%s\" nie używa się żadnych parametrów"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Pusta nazwa sposobu sortowania"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Niesparowany nawias \"(\" w opisie sposobu sortowania"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Nieznany sposób sortowania \"%s\""
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Nie można zdekodować łańcucha typu multibyte po \"%ls\""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Nie można zdekodować łańcucha typu wide-character po \"%s\""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s skompilowany %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompilator: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Skompilowane względem:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  wersja apt %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  wersja NCurses: Nieznana\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  wersja NCurses %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  wersja libsigc++: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Obsługa ept włączona.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Obsługa ept wyłączona.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  Gtk+ w wersji %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  Gtk-- w wersji %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Obsługa Gtk+ wyłączona.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "  Skompilowany z Qt %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr "  Uruchamianie korzystajÄ…c z Qt %s\n"
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Obsługa Qt wyłączona.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5414,32 +5392,32 @@ msgstr ""
 "\n"
 "Bieżące wersje bibliotek:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  wersja NCurses: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  wersja cwidget: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  wersja Apt: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Użycie: aptitude [-S nazwa-pliku] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opcje] <akcja> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5448,43 +5426,43 @@ msgstr ""
 "  Akcje (jeśli nie podano, aptitude uruchamia się w trybie interaktywnym):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instalacja/uaktualnienie pakietów.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Usunięcie pakietów.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Usunięcie pakietów i ich plików konfiguracyjnych.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Zatrzymanie pakietów.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Anulowanie zatrzymania pakietów.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 " markauto     - Zaznaczenie pakietów jako automatycznie zainstalowanych.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Zaznaczenie pakietów jako ręcznie zainstalowanych.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5492,17 +5470,17 @@ msgid ""
 msgstr ""
 " forbid-version - Zabronienie uaktualniania do określonej wersji pakietu.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Pobranie list nowych/uaktualnionych pakietów.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Bezpieczna aktualizacja systemu.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5511,52 +5489,52 @@ msgstr ""
 " full-upgrade - Aktualizacja systemu; możliwa instalacja/usunięcie "
 "pakietów.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr " build-dep    - Instalacja zależności na czas budowania pakietu.\n"
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Usunięcie informacji o tym, które pakiety są nowe.\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Wyszukiwanie pakietów według nazwy/wyrażenia.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Wyświetlanie szczegółowych informacji o pakiecie.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " versions     - Wyświetlanie wersji podanych pakietów.\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Usunięcie pobranych plików pakietów.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Usunięcie starych plików pakietów.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Wyświetlanie dziennika zmian pakietu.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Pobranie pliku .deb pakietu.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5564,7 +5542,7 @@ msgid ""
 msgstr ""
 " reinstall    - Pobranie i ponowna instalacja już zainstalowanego pakietu.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5576,7 +5554,7 @@ msgstr ""
 "                danego pakietu, lub dlaczego pakiet lub pakiety mogÄ… go "
 "wymagać.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5590,17 +5568,17 @@ msgstr ""
 "pakiety\n"
 "                mogą prowadzić do konfliktu z danym pakietem po instalacji.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opcje:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Ten tekst pomocy.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
@@ -5608,17 +5586,17 @@ msgstr ""
 " --gui          Używa interfejsu GTK, nawet jeśli go wyłączono w "
 "konfiguracji.\n"
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr " --no-gui       Nie używa interfejsu GTK, nawet jeśli jest dostępny.\n"
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " --qt           Używa interfejsu Qt.\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
@@ -5626,31 +5604,31 @@ msgstr ""
 " --no-qt        Nie używa interfejsu Qt, nawet jeśli go włączono w "
 "konfiguracji.\n"
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Symulacja akcji bez ich wykonania.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Pobranie pakietów bez instalacji lub usuwania czegokolwiek.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Pytanie o potwierdzenie wykonywanych akcji.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
 " -y             Przyjęcie odpowiedzi \"tak\" na pytania typu tak/nie.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5658,7 +5636,7 @@ msgid ""
 msgstr ""
 " -F format      Format wyświetlania wyników wyszukiwania; patrz podręcznik.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5666,36 +5644,36 @@ msgid ""
 msgstr ""
 " -O order       Sposób sortowania wyników wyszukiwania; patrz podręcznik.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w width       Szerokość wyświetlania wyników wyszukiwania.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Agresywne próby naprawienia niespełnionych zależności.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Wyświetlanie wersji pakietów do instalacji.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             Wyświetlanie zależności automatycznie zmienianych pakietów.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z             Wyświetlanie zmian rozmiarów pakietów.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5704,7 +5682,7 @@ msgstr ""
 " -v             Wyświetlanie dodatkowych informacji (można podać "
 "wielokrotnie).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
@@ -5712,7 +5690,7 @@ msgstr ""
 " -t [wydanie]   Ustalenie wydania z którego mają pochodzić instalowane "
 "pakiety.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5721,12 +5699,12 @@ msgstr ""
 " -q             Wyłączenie wskaźników postępu przy uruchomieniu w trybie\n"
 "                wiersza poleceń.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o nazwa=wartość  Bezpośrednie ustawienie wartości podanej opcji.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5735,29 +5713,29 @@ msgstr ""
 " --with(out)-recommends\tCzy traktować rekomendacje (sugestie) jak\n"
 "                silne zależności.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S nazwa-pliku Odczyt rozszerzonych informacji o stanie z pliku nazwa-"
 "pliku.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u:     : Uaktualnienie listy pakietów przy starcie.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr "                  (tylko interfejs terminalowy)\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Przeprowadzenie instalacji przy starcie.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Ten aptitude nie posiada Mocy Super Krowy.\n"
@@ -5765,49 +5743,49 @@ msgstr "                  Ten aptitude nie posiada Mocy Super Krowy.\n"
 # Tłumaczenie tego typu opcji chyba nie jest dobrym pomysłem?
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 msgid "trace"
 msgstr "trace"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 msgid "debug"
 msgstr "debug"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:399
+#: src/main.cc:365
 msgid "info"
 msgstr "info"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 msgid "warn"
 msgstr "warn"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:405
+#: src/main.cc:371
 msgid "error"
 msgstr "error"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 msgid "fatal"
 msgstr "fatal"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr "off"
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
@@ -5816,48 +5794,28 @@ msgstr ""
 "Nieprawidłowa nazwa poziomu dziennika \"%s\" (oczekiwano \"trace\", \"debug"
 "\", \"info\", \"warn\", \"error\", \"fatal\" lub \"off\")."
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, c-format
-msgid "Invalid logger name \"%s\"."
-msgstr "Błędna nazwa loggera  \"%s\"."
+msgid "Invalid logger name \"%s\""
+msgstr "Błędna nazwa loggera \"%s\""
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Brak liczby po -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Po -q= oczekiwano liczby, napotkano %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o wymaga podania argumentu postaci nazwa=wartość, otrzymano %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Brak kropki po nazwie znacznika \"%s\".\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "DZIWNE: otrzymano nieznany kod opcji\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr "--show-package-names|never"
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr "--show-package-names|auto"
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr "--show-package-names|always"
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
@@ -5866,29 +5824,29 @@ msgstr ""
 "Nieprawidłowy tryb wyświetlania nazw pakietów \"%s\" (oczekiwano \"never\", "
 "\"auto\" lub \"always\")."
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr "no-summary"
 
-#: src/main.cc:1027
+#: src/main.cc:781
 msgid "first-package"
 msgstr "first-package"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr "first-package-and-type"
 
-#: src/main.cc:1031
+#: src/main.cc:785
 msgid "all-packages"
 msgstr "all-packages"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr "all-packages-with-dep-versions"
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5899,37 +5857,41 @@ msgstr ""
 "\"first-package\", \"first-package-and-type\", \"all-packages\" lub \"all-"
 "packages-with-dep-versions\"."
 
-#: src/main.cc:1079
+#: src/main.cc:831
+#, fuzzy
+#| msgid ""
+#| "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may "
+#| "be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr ""
 "Można podać tylko jedną z opcji: --auto-clean-on-startup, --clean-on-"
 "startup, -i lub -u\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
+#, fuzzy
+#| msgid ""
+#| "-u, -i, and --clean-on-startup may not be specified in command-line mode "
+#| "(eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u, -i, ani --clean-on-startup nie można podać dla trybu wiersza poleceń "
 "(np. z \"install\")"
 
-#: src/main.cc:1105
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u, -i, ani --clean-on-startup nie można podać razem z poleceniem"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Nieznane polecenie: \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Nieznane polecenie: \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Nieobsłużony wyjątek: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5947,7 +5909,7 @@ msgstr "Wyszukiwany tekst: "
 msgid "Search backwards for: "
 msgstr "Znajdź (wstecz): "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Saper"
 
@@ -6146,7 +6108,7 @@ msgstr "Nazwa pliku do zapisania:"
 
 #: src/mine/cmine.cc:672
 msgid "mine-help.txt"
-msgstr "mine-help.txt"
+msgstr "mine-help-pl.txt"
 
 #: src/mine/cmine.cc:674
 msgid "Encoding of mine-help.txt|UTF-8"
@@ -6154,9 +6116,9 @@ msgstr "Kodowanie mine-help.txt|UTF-8"
 
 #: src/pkg_columnizer.cc:86
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
-msgstr "30 7 7 1 1 40 14 14 18 10 35 9 10 2 1 1 12 8 14 32 20 15"
+msgstr "30 7 7 1 1 40 14 14 18 10 35 9 10 2 1 1 12 8 15 25 20 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Pakiet"
 
@@ -6237,8 +6199,8 @@ msgstr "<NIEDOST.>"
 msgid "<none>"
 msgstr "<brak>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "wirtualne"
@@ -6346,12 +6308,12 @@ msgstr "Problemów: %ld"
 #: src/pkg_columnizer.cc:409
 #, c-format
 msgid "Will use %sB of disk space"
-msgstr "Zostanie zajęte %sB na dysku"
+msgstr "Zostanie zajęte: %sB"
 
 #: src/pkg_columnizer.cc:417
 #, c-format
 msgid "Will free %sB of disk space"
-msgstr "Zwolni siÄ™ %sB na dysku"
+msgstr "Zwolni siÄ™: %sB"
 
 #: src/pkg_columnizer.cc:431
 #, c-format
@@ -6372,7 +6334,7 @@ msgstr "Nie można przekodować formatu opisu pakietu po \"%ls\""
 msgid "Internal error: Default column string is unparsable"
 msgstr "Błąd wewnętrzny: domyślna konfiguracja kolumn jest błędna"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Zadania"
 
@@ -6528,11 +6490,11 @@ msgstr "Indeksy dopasowań muszą mieć wartość 1 lub większą, nie \"%s\""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "Indeks dopasowania %ls jest zbyt duży; dostępne grupy to (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PAKIETY BEZ ZNACZNIKÓW"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6543,10 +6505,6 @@ msgstr ""
 "znaczników debtags jest niedostępna (instalacja debtags może rozwiązać ten "
 "problem)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "BRAK ZNACZNIKA"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Pakiet źródłowy: "
@@ -7167,7 +7125,7 @@ msgstr "Odczyt stanu"
 msgid "Really quit Aptitude?"
 msgstr "Zakończyć Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Zmiana działania aptitude"
 
@@ -7249,7 +7207,7 @@ msgstr ""
 msgid "License"
 msgstr "Licencja"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Wyświetla warunki kopiowania i rozpowszechniania Aptitude"
 
@@ -7270,7 +7228,7 @@ msgstr "Pomoc on-line"
 msgid "View a brief introduction to aptitude"
 msgstr "Wyświetla krótkie wprowadzenie do Aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Pomoc"
 
@@ -7299,7 +7257,7 @@ msgstr "Podręcznik"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Wyświetla najczęściej zadawane pytania na temat Aptitude"
 
@@ -7342,15 +7300,15 @@ msgstr ""
 "skasować.%n%nUsunąć ten katalog wraz z zawartością? Po wybraniu \"Nie\" "
 "komunikat ten nie będzie ponownie wyświetlany."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Widok postępów pobierania pakietów"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Pobieranie pakietów"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7361,35 +7319,35 @@ msgstr ""
 "%nNiepewne pakiety mogą %Bzagrozić bezpieczeństwu systemu%b. Kontynuuj "
 "instalację tylko jeżeli dobrze wiesz co chcesz zrobić.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [wersja %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Kontynuacja mimo tego"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Przerwanie instalacji"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Przegląd planowanych działań"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "PrzeglÄ…danie i modyfikowanie akcji do wykonania"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Niektóre pakiety miały niespełnione zależności. Wprowadzono zmiany:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Nie istnieje rozwiązanie problemów z zależnościami!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7398,7 +7356,7 @@ msgstr ""
 "Przy rozwiązywaniu problemów z zależnościami przekroczono limit czasu "
 "(wciśnij \"%s\" by próbować dalej)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7406,20 +7364,20 @@ msgstr ""
 "Instalowanie/usuwanie pakietów wymaga uprawnień administratora, których nie "
 "posiadasz. Przełączyć na konto administratora?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Uzyskaj prawa administratora"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Porzuć prawa administratora"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "Nie jest zaplanowana instalacja, aktualizacja ani usunięcie żadnych pakietów."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7429,19 +7387,19 @@ msgstr ""
 "pakiety mogłyby być zaktualizowane, jednak wybrano pozostawienie ich w "
 "bieżących wersjach. Wciśnij \"U\" aby przygotować aktualizację."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Uaktualnianie list pakietów"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Widok postępów uaktualniania list pakietów"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Uaktualnianie list"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7449,23 +7407,23 @@ msgstr ""
 "Uaktualnianie listy pakietów wymaga uprawnień administratora, których nie "
 "posiadasz. Przełączyć na konto administratora?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Tracenie czasu na poszukiwaniu min"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Nie można czyścić archiwum w czasie pobierania pakietów"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Usuwanie pobranych plików"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Usunięto pobrane pliki pakietów"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7473,19 +7431,19 @@ msgstr ""
 "Czyszczenie magazynu podręcznego pakietów wymaga uprawnień administratora, "
 "których nie posiadasz. Przełączyć na konto administratora?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 "Informacje o pakietach są niedostępne, nie można usunąć nieaktualnych plików."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Usunięto nieaktualne pliki pakietów, zwalniając %sB na dysku."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7493,121 +7451,121 @@ msgstr ""
 "Usuwanie nieaktualnych plików wymaga uprawnień administratora, których nie "
 "posiadasz. Przełączyć na konto administratora?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Nie ma więcej rozwiązań."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Nie można znaleźć rozwiązania do zastosowania."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "PoszukujÄ…c rozwiÄ…zania przekroczono limit czasu."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Rozwiązywanie zależności"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Poszukiwanie rozwiązań problemów z niespełnionymi zależnościami"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Nie można otworzyć %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Błąd w czasie zapisu stanu procedury rozwiązywania zależności"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "Za^instaluj/usuń pakiety"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Uaktualnij listę pakietów"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Zaznacz ^do aktualizacji"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Zapomnij o nowościach"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Anuluj za^planowane zadania"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "Wyczyść ^archiwum pakietów"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Usuń ^nieaktualne pliki"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Odśwież archiwum pakietów"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Saper"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Uzyskaj p^rawa administratora"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "Za^kończ"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Cofnij"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Instaluj"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Dodaje wybrany pakiet do instalowanych/aktualizowanych"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Usuń"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Dodaje wybrany pakiet do usuwanych"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Wyczyść"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Dodaje wybrany pakiet do usuwanych wraz z plikami konfiguracyjnymi"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Pozostaw"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Odwołuje planowane działania na wybranym pakiecie"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Zatrzymaj"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7615,11 +7573,11 @@ msgstr ""
 "Odwołuje planowane działania na wybranym pakiecie i zapobiega jego "
 "uaktualnieniom w przyszłości"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "^Automatyczny"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7627,11 +7585,11 @@ msgstr ""
 "Oznacza wybrany pakiet jako zainstalowany automatycznie, czyli przeznaczony "
 "do usunięcia, gdy nie będzie przez nic wymagany"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Żą^dany"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7639,11 +7597,11 @@ msgstr ""
 "Oznacza wybrany pakiet jako zainstalowany ręcznie i niepodlegający "
 "automatycznemu usuwaniu"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "Za^broń tej wersji"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7651,19 +7609,19 @@ msgstr ""
 "Zabrania instalacji kandydujÄ…cej wersji wybranego pakietu; nowsze wersje "
 "będą instalowane normalnie"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformacje"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Wyświetla szczegółowe informacje o wybranym pakiecie"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "C^ykliczne przełączanie informacji o pakiecie"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7673,60 +7631,60 @@ msgstr ""
 "może być wyświetlany długi opis, podsumowanie zależności pakietu lub "
 "uzasadnienie dlaczego pakiet jest wymagany."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "Dzi^ennik zmian"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Wyświetla dziennik zmian wybranego pakietu"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Wyświetl rozwiązanie"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 "Wyświetla szczegóły aktualnie wybranego rozwiązania problemów z zależnościami"
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "^Zastosuj rozwiÄ…zanie"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Wykonuje działania składające się na aktualnie wybrane rozwiązanie"
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Następne rozwiązanie"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Wybiera następne rozwiązanie problemów z zależnościami"
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^Poprzednie rozwiÄ…zanie"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Wybiera poprzednie rozwiązanie problemów z zależnościami"
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "P^ierwsze rozwiÄ…zanie"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
-msgstr "Wybiera pierwsze rozwiązanie problemów z zależnościami"
+msgstr "Wybiera pierwsze rozwiązanie problemów z zależnościami."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "O^statnie rozwiÄ…zanie"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7734,35 +7692,35 @@ msgstr ""
 "Wybiera ostatnie wygenerowane do tej pory rozwiązanie problemów z "
 "zależnościami"
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Przełącz ^odrzucenie"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Zmienia decyzjÄ™ o odrzuceniu wybranej akcji"
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Przełącz ^akceptację"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Zmienia decyzjÄ™ o akceptacji wybranej akcji"
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "Wyświetl ^cel"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Wyświetla informacje o pakiecie, którego dotyczy wybrana akcja"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "O^drzucaj naruszenia zatrzymań"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7770,234 +7728,234 @@ msgstr ""
 "Odrzucanie wszystkich akcji, które zmieniłyby stan zatrzymania pakietów lub "
 "mogły zainstalować ich zabronione wersje"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Znajdź"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Nowe wyszukiwanie"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "Z^najdź poprzedni"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Nowe wyszukiwanie wstecz"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
-msgstr "Znajdź ^kolejny"
+msgstr "Znaj^dź kolejny"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Powtarza wyszukiwanie"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Ponownie zn^ajdź poprzedni"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Powtarza wyszukiwanie w przeciwnym kierunku"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Filtruj"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Ogranicza wyświetlaną listę pakietów"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Usuń filtr"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Usuwa ograniczenie wyświetlanej listy pakietów"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Znajdź ^problem"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Szuka kolejnego pakietu z niespełnionymi zależnościami"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Preferencje"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "Opcje ^interfejsu"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Zmienia opcje dotyczące interfejsu użytkownika"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Zależności"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Zmienia opcje dotyczące zależności między pakietami"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Różne"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Zmienia różne inne opcje programu"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "Przywróć ^domyślne"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Przywraca wszystkim opcjom wartości domyślne"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Następny"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Wyświetla następny widok"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Poprzedni"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Wyświetla poprzedni widok"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Zamknij"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Zamyka bieżący widok"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Nowy ^widok pakietów"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Tworzy nowy standardowy widok listy pakietów"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "P^olecane pakiety"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr "Wyświetla niezainstalowane pakiety, których instalacja jest polecana"
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Nowy płaski w^idok pakietów"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Wyświetla wszystkie pakiety bez podziału na kategorie"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Nowa przeglÄ…darka ^etykiet"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Pozwala na przeglądanie pakietów według etykiet Debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
-msgstr "Nowa przeglÄ…darka ^kategorii"
+msgstr "Nowa przeglÄ…darka ka^tegorii"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Pozwala na przeglądanie pakietów według kategorii"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^O Aptitude"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Wyświetla informacje o programie"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Pomoc"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Wyświetla pomoc Aptitude"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "Podręcznik ^użytkownika"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Wyświetla podręcznik użytkownika programu"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Nowości"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Wyświetla najważniejsze zmiany w kolejnych wersjach "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
-msgstr "^Licencja"
+msgstr "Li^cencja"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Akcje"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Znajdź"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Opcje"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Widoki"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr ""
-"%ls: Menu  %ls: Pomoc  %ls: Zakończ  %ls: Uaktualnij  %ls: Pobierz/instaluj/"
+"%ls: menu  %ls: pomoc  %ls: zakończ  %ls: uaktualnij  %ls: pobierz/instaluj/"
 "usuń"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "t"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -8025,11 +7983,51 @@ msgstr "Pobierania dziennika zmian pakietu %s nie powiodło się: %s"
 msgid "Downloading the changelog of %s"
 msgstr "Pobieranie dziennika zmian pakietu %s"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr ""
-"Możliwe jest wyświetlanie dzienników zmian tylko oficjalnych pakietów "
-"Debiana."
+#~ msgid "MISSING TAG"
+#~ msgstr "BRAK ZNACZNIKA"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL pobierania dzienników zmian"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Ta opcja określa wzór adresu używanego do pobierania dzienników zmian ze "
+#~ "strony Debiana. Powinno używać się tej opcji tylko jeśli dzienniki zmian "
+#~ "zostanÄ… przeniesione pod inny URL."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s nie jest oficjalnym pakietem Debiana. Nie można wyświetlić dziennika "
+#~ "zmian."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Nie znaleziono pakietu \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Nie można przetworzyć wzorca %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Brak liczby po -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Po -q= oczekiwano liczby, napotkano %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o wymaga podania argumentu postaci nazwa=wartość, otrzymano %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "DZIWNE: otrzymano nieznany kod opcji\n"
+
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u, -i, ani --clean-on-startup nie można podać razem z poleceniem"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr ""
+#~ "Możliwe jest wyświetlanie dzienników zmian tylko oficjalnych pakietów "
+#~ "Debiana."
 
 #~ msgid "Err "
 #~ msgstr "BÅ‚Ä…d "
@@ -8214,11 +8212,6 @@ msgstr ""
 #~ msgstr "Pobieranie dziennika zmian"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Nie znaleziono rozwiÄ…zania."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Nie można otworzyć pliku hierarchii pakietów %s"
diff --git a/po/pt.gmo b/po/pt.gmo
index 8e6196f9..03715454 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index d466deae..4df72bcf 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:29+0800\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianPT.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -369,24 +369,10 @@ msgstr ""
 "list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL a utilizar para fazer a transferência dos 'changelogs'"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Esta opção controla o modelo que é utilizado para transferir os 'changelogs' "
-"do website Debian.  Só terá de alterar isto se os 'changelogs' mudarem para "
-"outro URL."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Exibir uma previsão do que será feito antes de o fazer"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -394,14 +380,14 @@ msgstr ""
 "Se esta opção estiver activa, quando pedir ao aptitude para executar uma "
 "instalação, primeiro irá mostrar um sumário das acções que irá executar."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 "Esquecer que pacotes são \"novos\" sempre que as listas de pacotes forem "
 "actualizadas"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -410,14 +396,14 @@ msgstr ""
 "pacotes após você actualizar as listas de pacotes (o mesmo que ao pressionar "
 "'u')."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Esquecer quais os pacotes que são \"novos\" sempre que pacotes forem "
 "instalados ou removidos"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -427,14 +413,14 @@ msgstr ""
 "pacotes após você executar uma instalação ou instalar ou remover pacotes a "
 "partir da linha de comandos."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "Não mostrar um aviso quando é feita a primeira alteração em modo de apenas-"
 "leitura"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -444,12 +430,12 @@ msgstr ""
 "você modificar o estado de um pacote se não tiver permissões para aplicar as "
 "alterações ao sistema."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Avisar quando tentar executar uma acção privilegiada como utilizador não-root"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -461,11 +447,11 @@ msgstr ""
 "instalar pacotes como utilizador que não o root.  Ser-lhe-à dada a opção de "
 "se identificar como root e executar a acção com os privilégios de root."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Ficheiro para guardar o registo das acções"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -477,12 +463,12 @@ msgstr ""
 "for um 'pipe' ('%B|%b'), o resto do nome será interpretado como um comando "
 "da shell que está para receber o registo na entrada standard."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr ""
 "Resolver automaticamente dependências de um pacote quando for seleccionado"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -495,12 +481,12 @@ msgstr ""
 "dependências incorporado, mas pode produzir resultados não-óptimos ou em "
 "alguns cenários falhar completamente."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Corrigir automaticamente pacotes danificados antes de instalar ou remover"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -512,11 +498,11 @@ msgstr ""
 "solucionador de problemas.  Caso contrário, o aptitude irá perguntar-lhe a "
 "solução para os pacotes com problemas."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Instalar automaticamente pacotes recomendados"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -534,11 +520,11 @@ msgstr ""
 "utilizados\" estiver activa, os pacotes que forem recomendados por um pacote "
 "instalado não serão automaticamente removidos."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Remover automaticamente pacotes não utilizados"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -556,11 +542,11 @@ msgstr ""
 "recomendados\" estiver activo, os pacotes instalados automaticamente não "
 "serão removidos se algum pacote instalado os recomendar."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Pacotes que nunca devem ser removidos automaticamente"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -570,13 +556,13 @@ msgstr ""
 "se um pacote instalado dependesse deles: estes nunca serão seleccionados "
 "para serem removidos como os pacotes não utilizados."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Permitir resoluções de dependências que estraguem a manutenção ou proibição "
 "de pacotes"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -598,15 +584,15 @@ msgstr ""
 "mantidos quando instalar automaticamente dependências de um pacote que tenha "
 "acabado de ser escolhido para instalação ou actualização."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Opções UI"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Lidar com dependências"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Diversos"
 
@@ -710,7 +696,7 @@ msgstr "Não foi possível encontrar o pacote de código-fonte para \"%s\".\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Não foi possível satisfazer as dependências de compilação: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -719,7 +705,7 @@ msgstr ""
 "Nota : \"%s\", que disponibiliza o pacote virtual\n"
 "       \"%s\", que já está instalado.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -728,7 +714,7 @@ msgstr ""
 "Nota : \"%s\", disponibiliza o pacote virtual\n"
 "       \"%s\", já irá ser instalado.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -737,17 +723,22 @@ msgstr ""
 "\"%s\" existe na base de dados de pacotes, mas não é\n"
 "um pacote verdadeiro e nenhum pacote o disponibiliza.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" é um pacote virtual disponibilizado por:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Tem de escolher um para instalar.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "O pacote '%s' não tem candidato para instalação"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -756,65 +747,57 @@ msgstr ""
 "Nota : a seleccionar \"%s\" em vez do\n"
 "       pacote virtual \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s já está instalado na versão pedida (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s não está actualmente instalado, portanto não será reinstalado.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s já está instalado na versão pedida (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s não está actualmente instalado, portanto não será reinstalado.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "O pacote %s não está instalado, portanto não será removido\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "O pacote %s não está instalado, não é possível proibir uma actualização\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "O pacote %s não é actualizável, não é possível proibir uma actualização\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Nota: a seleccionar a tarefa \"%s: %s\" para instalação\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Só pode especificar uma versão de pacote com um comando 'install' ou com um "
-"comando 'forbid-version'.\n"
+"comando 'forbid-version'"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr ""
-"Só pode especificar um repositório de pacotes com o comando 'install'.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Só pode especificar um repositório de pacotes com o comando 'install'"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -823,7 +806,7 @@ msgstr ""
 "Não foi possível encontrar o pacote \"%s\", e mais de 40\n"
 "pacotes contêm \"%s\" no seu nome.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -832,14 +815,14 @@ msgstr ""
 "Não foi possível encontrar o pacote \"%s\". No entanto,\n"
 "os seguintes pacotes contêm \"%s\" no seu nome:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Não foi possível encontrar nenhum pacote em que o nome ou a descrição "
 "coincida com \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -857,7 +840,7 @@ msgstr ""
 "Não foi possível encontrar nenhum pacote que coincida com \"%s\".  \n"
 "No entanto, os seguintes pacotes contêm \"%s\" na sua descrição:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Carácter de acção '%c' não disponível\n"
@@ -880,7 +863,7 @@ msgstr "Err "
 msgid "Changelog download failed: %s"
 msgstr "A apagar ficheiros transferidos"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "Não foi possível executar o sensible-pager, este é um sistema Debian "
@@ -888,96 +871,80 @@ msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s não é um pacote oficial Debian, não é possível mostrar o seu 'changelog'."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Não foi possível encontrar um 'changelog' para %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "Não foi possível encontrar um 'changelog' para %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: O comando clean não leva argumentos\n"
+msgid "The clean command takes no arguments"
+msgstr "O comando clean não leva argumentos"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Del %s* %sparcial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr ""
 "Não foi possível ver o seu directório home, a gravar para /tmp/function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Del %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: O comando autoclean não leva argumentos\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "O comando autoclean não leva argumentos"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Iria libertar %sB de espaço em disco\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Libertado %sB de espaço em disco\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operação inválida %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Argumento de padrão não esperado a seguir a \"keep-all\""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "Não foi possível resolver as dependências de forma segura, tente correr com\n"
-"--full-resolver.\n"
+"--full-resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Abortar.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "download: tem de especificar pelo menos um pacote para transferir\n"
+msgid "download: you must specify at least one package to download"
+msgstr "download: tem de especificar pelo menos um pacote para transferir"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Não foi possível ler a lista de fontes"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Não foi possível encontrar nenhum pacote chamado \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1017,33 +984,24 @@ msgid "[Working]"
 msgstr "[A trabalhar]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: é necessário pelo menos um argumento (o directório\n"
-"para onde escrever os ficheiros).\n"
+"extract-cache-entries: é necessário pelo menos um argumento (o directório "
+"para onde escrever os ficheiros)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Pacote \"%s\" não existe"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 "Não foram escolhidos pacotes pelo dado padrão de procura: nada a fazer.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: O comando forget-new não leva argumentos\n"
+msgid "The forget-new command takes no arguments"
+msgstr "O comando forget-new não leva argumentos"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Esqueceria quais os pacotes que são novos\n"
@@ -1150,19 +1108,19 @@ msgstr "Os seguintes pacotes serão actualizados:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Os seguintes pacotes parcialmente instalados serão configurados:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Os seguintes pacotes ESSENCIAIS serão REMOVIDOS !\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "Os seguintes pacotes ESSENCIAIS ficarão COM PROBLEMAS por causa desta "
 "acção:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1172,16 +1130,16 @@ msgstr ""
 "fique com problemas!\n"
 "        NÃO continue a menos que saiba EXACTAMENTE o que está a fazer!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Estou ciente de que esta é uma ideia muito má"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Para continuar, introduza a frase \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1197,7 +1155,7 @@ msgstr ""
 "Você só deve prosseguir com a instalação se tiver a certeza de que é\n"
 "isto o que deseja fazer.\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1206,7 +1164,7 @@ msgstr ""
 " *** AVISO ***   A ignorar estas violações de confiança porque\n"
 "                 %s::CmdLine::Ignore-Trust-Violations é 'true'!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1219,7 +1177,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr "Continuar e ignorar o aviso|Sim"
 
@@ -1228,100 +1186,100 @@ msgstr "Continuar e ignorar o aviso|Sim"
 #. 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr "Abortar em vez de ultrapassar o aviso|Não"
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Deseja ignorar este aviso e continuar de qualquer forma?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Para continuar, introduza \"%s\"; para abortar, introduza \"%s\": "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Entrada não reconhecida.  Introduza ou \"%s\" ou \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Os seguintes pacotes são RECOMENDADOS mas NÃO serão instalados:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Os seguintes pacotes são SUGERIDOS mas NÃO serão instalados:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Nenhum pacote será instalado, actualizado ou removido.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pacotes actualizados, %lu novos instalados, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu alterados para uma versão anterior, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu para serem removidos e %lu não actualizados.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "É preciso obter %sB/%sB de ficheiros. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "É preciso obter %sB de ficheiros. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Depois de desempacotar serão utilizados %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Depois de desempacotar, serão libertados %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Não existem pacotes para mostrar -- introduza os nomes dos pacotes na linha "
 "a seguir a 'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Carregue em Return (Enter) para continuar."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Não foram encontrados pacotes -- introduza os nomes dos pacotes na linha a "
 "seguir a 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1330,30 +1288,30 @@ msgstr ""
 "Não foram encontrados pacotes -- introduza zero ou mais raízes da procura "
 "seguido do pacote a justificar.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "continuar com a instalação"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "abortar e sair"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1361,12 +1319,12 @@ msgstr ""
 "mostrar informação acerca de um ou mais pacotes; os nomes de pacotes devem "
 "seguir o 'i'"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1374,39 +1332,39 @@ msgstr ""
 "mostrar os 'changelogs' Debian de um ou mais pacotes; os nomes de pacotes "
 "devem seguir o 'c'"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "comutar a visualização de informações de dependências"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "comutar a exibição de alterações nos tamanhos de pacotes"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "comutar a exibição de números de versão"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1414,26 +1372,26 @@ msgstr ""
 "tentar encontrar a razão para instalar um único pacote, ou explicar porque "
 "instalar um pacote deve levar à instalação de um outro pacote."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "correr o resolvedor de dependências para corrigir os pacotes problemáticos."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "entrar no interface visual completo"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1445,47 +1403,47 @@ msgstr ""
 "pacotes (ou padrões).  A acção será aplicada a todos os pacotes que você "
 "listar.  Estão disponíveis as seguintes acções:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' para instalar pacotes"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M' para instalar pacotes e imediatamente marcá-los como automaticamente "
 "instalados"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' para remover pacotes"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' para purgar pacotes"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' para colocar pacotes em hold"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':' para manter os pacotes no seu estado actual sem os colocar em hold"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' para marcar pacotes como automaticamente instalados"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' para marcar pacotes como manualmente instalados"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "'&BD' para instalar as dependências de compilação de um pacote."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1493,29 +1451,29 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "Se o pacote é instalado automaticamente."
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Comandos:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1523,21 +1481,21 @@ msgstr ""
 "O aptitude não conseguiu encontrar uma solução para estas dependências.  "
 "Pode resolvê-las você mesmo, manualmente, ou escrever 'n' e sair."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Deseja continuar ? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Resolver estas dependências à mão? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Resposta inválida.  Por favor introduza um comando válido ou '?' para "
 "ajuda.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1546,7 +1504,7 @@ msgstr ""
 "um pacote), 'R' para tentar a resolução automática de dependências ou 'N' "
 "para cancelar."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1557,7 +1515,7 @@ msgstr ""
 "A informação de dependências será exibida.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1568,7 +1526,7 @@ msgstr ""
 "A informação de dependências não será exibida.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1579,7 +1537,7 @@ msgstr ""
 "As versões serão mostradas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1590,7 +1548,7 @@ msgstr ""
 "As versões não serão mostradas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1601,7 +1559,7 @@ msgstr ""
 "As alterações de tamanho serão exibidas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1739,6 +1697,11 @@ msgstr "É esperado pelo menos um par pacote/versão seguindo '%c'"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Esperava uma versão ou \"%s\" após \"%s\""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Pacote \"%s\" não existe"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1890,7 +1853,7 @@ msgstr ""
 "Eu quero resolver as dependências, mas não foi criado um resolvedor de "
 "dependências."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1920,7 +1883,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Estão disponíveis os seguintes comandos:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Ficheiro para onde escrever o estado do resolvedor: "
 
@@ -1954,7 +1917,7 @@ msgstr ""
 "*** ERRO: pesquisa abortada por uma excepção fatal.  Pode continuar\n"
 "          a pesquisa, mas algumas soluções serão inalcançáveis."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1963,26 +1926,25 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Não foi possível resolver para a actualização (não foi encontrada solução)."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Não foi possível resolver as dependências para a actualização (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "falhou iconv de %s.\n"
+msgid "iconv of %s failed"
+msgstr "falhou iconv de %s"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "pesquisa: Deve fornecer pelo menos um termo para pesquisar\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "pesquisa: Deve fornecer pelo menos um termo para pesquisar"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2025,7 +1987,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Os seguintes pacotes têm dependências não satisfeitas:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2248,7 +2210,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Disponibiliza"
 
@@ -2262,15 +2224,9 @@ msgstr "Descrição: "
 msgid "Homepage: "
 msgstr "Página de Internet: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Não foi possível localizar o pacote %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Não foi possível processar o padrão %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Não foi encontrado nenhum pacote"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2281,14 +2237,13 @@ msgstr "Iria fazer a transferência/instalar/remover pacotes.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Erro interno, a Ordenação não terminou"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "A apagar os ficheiros transferidos que são obsoletos"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: O comando update não leva argumentos\n"
+msgid "The update command takes no arguments"
+msgstr "O comando update não leva argumentos"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2307,133 +2262,154 @@ msgstr ""
 "%s: argumentos insuficientes; esperado pelo menos um nome de 'tag' e um "
 "pacote.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Não foi encontrada nenhuma versão candidata para %s\n"
+msgid "No candidate version found for %s"
+msgstr "Não foi encontrada nenhuma versão candidata para %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Nenhuma foi encontrada nenhuma versão actual ou candidata para %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "Nenhuma foi encontrada nenhuma versão actual ou candidata para %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr ""
-"Não foi possível encontrar um repositório \"%s\" para o pacote \"%s\"\n"
-
-#: src/cmdline/cmdline_util.cc:203
-#, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Não foi possível encontrar uma versão \"%s\" para o pacote \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Não foi possível encontrar um repositório \"%s\" para o pacote \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Erro interno : valor %i inválido passado a cmdline_find_ver!\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Não foi possível encontrar uma versão \"%s\" para o pacote \"%s\""
 
-#: src/cmdline/cmdline_util.cc:239
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Não pode especificar um arquivo e uma versão para um pacote\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Erro interno : valor %i inválido passado a cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Não foi possível encontrar um 'changelog' para %s"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Não pode especificar um arquivo e uma versão para um pacote"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d estrago [%+d]"
 msgstr[1] "%d estragados [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d actualização [%+d]"
 msgstr[1] "%d actualizações [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d novo [%+d]"
 msgstr[1] "%d novos [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Estado actual: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "Existe %d pacote obsoleto."
 msgstr[1] "Existem %d pacotes obsoletos."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "Existe %d novo pacote obsoleto: "
 msgstr[1] "Existem %d novos pacotes obsoletos: "
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Nenhuma vírgula a seguir o nome do 'tag' \"%s\""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Não foi possível localizar o pacote %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Não foi possível encontrar um 'changelog' para %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Nota: a seleccionar a tarefa \"%s: %s\" para instalação\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Não foi possível encontrar um 'changelog' para %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Pacotes"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Pacote de Fonte: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "Arquivo"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "pesquisa: Deve fornecer pelo menos um termo para pesquisar\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2456,7 +2432,7 @@ msgstr "Actual"
 msgid "Candidate"
 msgstr "Candidato"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Instalar"
 
@@ -2561,23 +2537,20 @@ msgstr "Não foi possível encontrar uma razão para instalar %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Pacotes que necessitam de %s:"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Não existe nenhum pacote chamado \"%s\"."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Não foi possível processar alguns padrões a coincidir."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
-"%s: este comando necessita de pelo menos um argumento (o pacote a "
-"interrogar).\n"
+"%s: este comando necessita de pelo menos um argumento (o pacote a interrogar)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2603,11 +2576,11 @@ msgstr "(NÃO SATISFEITAS)"
 msgid "UNAVAILABLE"
 msgstr "INDISPON�VEL"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Tags"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Tags do Utilizador"
 
@@ -2819,32 +2792,32 @@ msgstr ""
 "A abrir em modo de leitura; quaisquer alterações que faça aos estados dos "
 "pacotes NÃO serão preservadas!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 msgid "allowed"
 msgstr "permitir_escolhas"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "principal"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2917,36 +2890,44 @@ msgstr ""
 "Busca inválida de nível \"%s\" (não \"conflict\", \"minimum\", ou um "
 "inteiro)."
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "A cache de pacotes não está disponível; não foi possível transferir e "
 "instalar os pacotes."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Erro interno: não foi possível gerar a lista de pacotes a transferir"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Falhou a obtenção de %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Não foi possível obter alguns arquivos, tente talvez correr aptitude update "
+"ou tente com --fix-missing?"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Não é possível corrigir para pacotes não disponíveis"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Falhou a instalação de um pacote. A tentar recuperar:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3097,13 +3078,13 @@ msgstr ""
 "\n"
 "Log completo.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "A transferir pacotes"
@@ -3218,18 +3199,18 @@ msgstr ""
 "Os ficheiros de índice de pacotes estão corrompidos. Não existe o campo "
 "Filename: para o pacote %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "'Changelog' de %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "Falhou a transferência do changelog: %s"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Falhou a transferência do changelog: %s"
@@ -3285,26 +3266,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Falhou a transferência do changelog: %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "A construir a base de dados de tags"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "Nenhuma actualização disponível."
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "Nenhuma actualização disponível."
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3453,43 +3435,43 @@ msgstr "Gestor de Pacotes Aptitude"
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Executar todas as instalações e remoções pendentes"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Procurar por novas versões de pacotes"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Marcar para actualização todos os pacotes actualizáveis que não sejam para "
 "manter"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Esquecer os pacotes que são \"novos\""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Cancelar todas as instalações pendentes, remoções, suspensos (hold) e "
 "actualizações."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Apagar ficheiros de pacotes que foram previamente transferidos"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Apagar ficheiros de pacotes que já não possam ser transferidos"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Reler a cache de pacotes"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3499,7 +3481,7 @@ msgstr ""
 "Executar 'su' para se tornar root; isto irá reiniciar o programa, mas as "
 "suas configurações serão mantidas"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Sair do programa"
 
@@ -3507,7 +3489,7 @@ msgstr "Sair do programa"
 msgid "E_dit"
 msgstr "E_ditar"
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Desfaz a última operação ou grupo de operações"
 
@@ -3539,7 +3521,7 @@ msgid "_Help"
 msgstr "_Ajuda"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr "Painel"
 
@@ -3547,19 +3529,19 @@ msgstr "Painel"
 msgid "Update"
 msgstr "Actualizar"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Pacotes"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Ver antes"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Resolver"
 
@@ -3735,7 +3717,7 @@ msgid "Fix Manually"
 msgstr "Corrigir Manualmente"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Actualizar"
 
@@ -4271,11 +4253,11 @@ msgstr "Instalado"
 msgid "Reinstall"
 msgstr "Reinstalar"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Downgrade"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Remover"
 
@@ -4307,7 +4289,7 @@ msgstr "Tem de ser root para actualizar as listas de pacotes."
 msgid "Download already running."
 msgstr "Download já a decorrer."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "Uma actualização da lista de pacotes ou uma instalação já está em execução."
@@ -4375,41 +4357,41 @@ msgstr "Erro no pacote %s"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Perguntar se é para substituir o ficheiro de configuração %s"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "A transferir pacotes"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr "Pacotes com problemas"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr "Mostrar pacotes com problemas"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr "Resolver dependências"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "%d pacote com problemas"
 msgstr[1] "%d pacotes com problemas."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr "Ver alterações"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr "Aplicar alterações"
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4419,60 +4401,60 @@ msgstr[1] "%d pacotes a instalar"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%d pacote a remover"
 msgstr[1] "%d pacotes a remover"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr "Tamanho do download: %sB."
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr "Tags de %s:\n"
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr "Esta funcionalidade ainda não está implementada."
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr "Não implementado"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr "Instalar/Actualizar"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr "Purgar"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Manter"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Manter a versão"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr "Definir como automático"
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr "Definir como manual"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr "Comutar o estado automático"
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4509,7 +4491,7 @@ msgstr "Info"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4553,15 +4535,15 @@ msgstr "%s está a ser instalado manualmente."
 msgid "Cache reloading, please wait..."
 msgstr "A carregar novamente a cache, por favor aguarde..."
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr "A procurar..."
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr "A finalizar a vista"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "A criar vista"
@@ -5284,108 +5266,109 @@ msgstr "Tipo de alinhamento '%s' desconhecido"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "As políticas de ordenação por nome não têm argumentos"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Nome de política de ordenação de tamanho zero inválido"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "'(' sem par na descrição da política de ordenação "
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Tipo de política de ordenação '%s' inválido"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Não pode descodificar string multibyte após \"%ls\""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Não pode descodificar string de tamanho de carácter após \"%s\""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilado em %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilador: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Compilado com:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt versão %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  Versão do NCurses: Desconhecida\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr " NCurses versão %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++ versão: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Activado suporte para Ept.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Suporte para Ept desactivado.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt versão %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt versão %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Suporte para Ept desactivado.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s compilado em %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Suporte para Ept desactivado.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5393,32 +5376,32 @@ msgstr ""
 "\n"
 "Versões das bibliotecas actuais:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  NCurses versão: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  cwidget versão: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Apt versão: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Utilização: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opções] <acção> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5428,44 +5411,44 @@ msgstr ""
 "interactivo):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instalar/actualizar pacotes.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Remover pacotes.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Remover pacotes e os seus ficheiros de configuração.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Manter pacotes na versão actual.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Cancelar o comando hold para um pacote.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 " markauto     - Marcar pacotes como tendo sido automaticamente instalados.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr ""
 " unmarkauto   - Marcar pacotes como tendo sido manualmente instalados.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5474,17 +5457,17 @@ msgstr ""
 " forbid-version - Proibir o aptitude de actualizar para uma versão "
 "específica de um pacote.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Transferir as listas de pacotes novos/actualizáveis.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Executar uma actualização segura.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5494,52 +5477,52 @@ msgstr ""
 "removendo\n"
 "                pacotes.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' para instalar as dependências de compilação de um pacote."
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Esquecer quais os pacotes que são \"novos\".\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Procurar um pacote por nome e/ou expressão.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Mostrar informação detalhada acerca de um pacote.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Mostrar informação detalhada acerca de um pacote\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Apagar ficheiros de pacotes já transferidos.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Apagar ficheiros antigos de pacotes transferidos.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Ver o registo de alterações de um pacote.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Transferir o ficheiro .deb para um pacote.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5549,7 +5532,7 @@ msgstr ""
 "actualmente\n"
 "                instalado.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5561,7 +5544,7 @@ msgstr ""
 "                pacote, ou porque um ou mais pacotes necessitariam dum dado\n"
 "                pacote.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5572,58 +5555,58 @@ msgstr ""
 " why-not      - Mostrar os pacotes instalados manualmente que levam a um\n"
 "                conflito com o dito pacote, se instalado.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opções:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Este texto de ajuda.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 " --gui\t\t Utilizar o GUI GTK mesmo que desabilitado na configuração.\n"
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr " --no-gui \tNão utilizar o GUI GTK mesmo que disponível.\n"
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Este texto de ajuda\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, fuzzy, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 " --gui\t\t Utilizar o GUI GTK mesmo que desabilitado na configuração.\n"
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simular acções, sem as executar.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Transferir apenas os pacotes, não instalar ou remover nada.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Pedir sempre por confirmação ou acções.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5631,7 +5614,7 @@ msgstr ""
 " -y             Assumir que a resposta é 'sim' para perguntas simples de sim/"
 "não.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5640,7 +5623,7 @@ msgstr ""
 " -F formato      Especificar um formato para exibição dos resultados da\n"
 "                 pesquisa; ver o manual.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5649,7 +5632,7 @@ msgstr ""
 " -O ordem       Especifica como os resultados das pesquisas devem ser\n"
 "                ordenados; ver o manual.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
@@ -5658,19 +5641,19 @@ msgstr ""
 "resultados\n"
 "                 de pesquisa.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Tentar agressivamente corrigir os pacotes com problemas.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 " -V             Exibir quais as versões de pacotes que irão ser instalados.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -5678,13 +5661,13 @@ msgstr ""
 " -D             Exibir as dependências dos pacotes modificados "
 "automaticamente.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 " -Z             Mostrar a alteração no tamanho instalado de cada pacote.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5692,14 +5675,14 @@ msgid ""
 msgstr ""
 " -v             Exibir informação extra. (pode ser fornecido várias vezes).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 " -t [release]   Define de que distribuição os pacotes devem ser instalados.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5708,13 +5691,13 @@ msgstr ""
 " -q             No modo de linha de comandos, suprimir os indicadores\n"
 "                incrementais de progresso.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o key=val     Define directamente a opção de configuração chamada 'key'.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5723,77 +5706,77 @@ msgstr ""
 " --with(out)-recommends\tEspecifica se as recomendações devem ser \n"
 "                tratadas como dependências fortes.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fname       Lê a informação de estado estendido do aptitude do fname.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Transferir novas listas de pacotes no arranque.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             Este texto de ajuda\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Executa uma execução de instalação no arranque.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Este aptitude não tem Poderes de Super Vaca.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 msgid "trace"
 msgstr "trace"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 msgid "debug"
 msgstr "debug"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:399
+#: src/main.cc:365
 msgid "info"
 msgstr "info"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 msgid "warn"
 msgstr "warn"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:405
+#: src/main.cc:371
 msgid "error"
 msgstr "erro"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 msgid "fatal"
 msgstr "fatal"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr "off"
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
@@ -5802,77 +5785,57 @@ msgstr ""
 "Nome de nível de log desconhecido \"%s\" (esperado \"trace\", \"debug\", "
 "\"info\", \"warn\", \"error\", \"fatal\", ou \"off\")."
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, c-format
-msgid "Invalid logger name \"%s\"."
-msgstr "Nome de logger inválido \"%s\"."
+msgid "Invalid logger name \"%s\""
+msgstr "Nome de logger inválido \"%s\""
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Esperava um número após -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Esperava um número após -q=, foi obtido %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o necessita de um argumento na forma chave=valor, foi obtido %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Nenhuma vírgula a seguir o nome do 'tag' \"%s\".\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "ESTRANHO: recebida uma opção de código desconhecida\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr "no-summary"
 
-#: src/main.cc:1027
+#: src/main.cc:781
 msgid "first-package"
 msgstr "first-package"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr "first-package-and-type"
 
-#: src/main.cc:1031
+#: src/main.cc:785
 msgid "all-packages"
 msgstr "all-packages"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr "all-packages-with-dep-versions"
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5883,38 +5846,33 @@ msgstr ""
 "\"first-package\", \"first-package-and-type\", \"all-packages\", ou \"all-"
 "packages-with-dep-versions\"."
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Apenas uma das opções -u e -i pode ser especificada\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u e -i não podem ser especificadas em modo de linha de comando (eg. com "
 "'install')"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u e -i não podem ser especificadas com um comando"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Comando desconhecido \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Comando desconhecido \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Excepção não tratada: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5932,7 +5890,7 @@ msgstr "Procurar por: "
 msgid "Search backwards for: "
 msgstr "Procurar para trás por: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Campo Minado"
 
@@ -6145,7 +6103,7 @@ msgstr "Codificação de mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Pacote"
 
@@ -6226,8 +6184,8 @@ msgstr "<N/D>"
 msgid "<none>"
 msgstr "<nenhum>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtual"
@@ -6363,7 +6321,7 @@ msgstr ""
 msgid "Internal error: Default column string is unparsable"
 msgstr "Erro interno: String de coluna padrão não é interpretável"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -6522,11 +6480,11 @@ msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 "O índice coincidente %ls é demasiado grande; os grupos disponíveis são (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PACOTES SEM TAGS"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6537,10 +6495,6 @@ msgstr ""
 "do debtags não está presente (instalar o debtags poderá corrigir este "
 "problema)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "FALTA FAG"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Pacote de Fonte: "
@@ -7167,7 +7121,7 @@ msgstr "A carregar a cache"
 msgid "Really quit Aptitude?"
 msgstr "Deseja mesmo sair do Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Modificar o comportamento do aptitude"
 
@@ -7249,7 +7203,7 @@ msgstr ""
 msgid "License"
 msgstr "Licença"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Ver os termos sob os quais pode copiar e distribuir o aptitude"
 
@@ -7270,7 +7224,7 @@ msgstr "Ajuda Online"
 msgid "View a brief introduction to aptitude"
 msgstr "Ver uma breve introdução ao aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Ajuda"
 
@@ -7299,7 +7253,7 @@ msgstr "Manual"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Ver a lista de perguntas frequentes"
 
@@ -7341,15 +7295,15 @@ msgstr ""
 "%nDeseja remover este directório e todo o seu conteúdo?  Se seleccionar \"Não"
 "\", não verá esta mensagem novamente."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Ver o progresso da transferência do pacote"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Transferência de Pacote"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7361,35 +7315,35 @@ msgstr ""
 "Você deve apenas proceder com a instalação se tiver a certeza de que é isto "
 "que deseja fazer.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versão %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Continuar Mesmo"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Abortar a Instalação"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Previsão da instalação de pacotes"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Ver e/ou ajustar as acções que serão executadas"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alguns pacotes estavam com problemas e foram corrigidos:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Não existe solução para estes problemas de dependências!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7398,7 +7352,7 @@ msgstr ""
 "Esgotou o tempo enquanto tentava resolver dependências (carregue em \"%s\" "
 "para tentar melhor)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7406,21 +7360,21 @@ msgstr ""
 "Instalar/remover pacotes requer privilégios administrativos, que você "
 "actualmente não possui.  Deseja mudar para a conta de root?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Tornar-se root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Não se tornar root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "Não estão agendados nenhuns pacotes para serem instalados, removidos ou "
 "actualizados."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7430,19 +7384,19 @@ msgstr ""
 "pacotes podiam ser actualizados, mas você escolheu não os actualizar. "
 "Carregue em \"U\" para preparar uma actualização."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "A actualizar as listas de pacotes"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Ver o progresso da actualização da lista de pacotes"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Lista de Actualizações"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7450,23 +7404,23 @@ msgstr ""
 "Actualizar a lista de pacotes requer privilégios administrativos, que você "
 "actualmente não possui. Deseja mudar para a conta de root ?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Gaste tempo a tentar encontrar minas"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Não é permitido limpar enquanto está em curso uma transferência"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "A apagar ficheiros transferidos"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Ficheiros de pacotes transferidos foram apagados"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7475,13 +7429,13 @@ msgstr ""
 "Actualizar a lista de pacotes requer privilégios administrativos, que você "
 "actualmente não possui. Deseja mudar para a conta de root ?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 "O ficheiro de cache do apt não está disponível; não pode fazer a limpeza "
 "automática."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7490,7 +7444,7 @@ msgstr ""
 "Ficheiros de pacotes obsoletos transferidos foram apagados, libertando %sB "
 "de espaço em disco."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7499,124 +7453,124 @@ msgstr ""
 "Actualizar a lista de pacotes requer privilégios administrativos, que você "
 "actualmente não possui. Deseja mudar para a conta de root ?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Não há mais soluções."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Não foi possível encontrar uma solução para aplicar."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Esgotou o tempo enquanto tentava encontrar uma solução."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Resolver Dependências"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Procurar por soluções para dependências não satisfeitas"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Não foi possível abrir %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Erro enquanto fazia o dump do estado do resolvedor"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Instalar/remover pacotes"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "Act^ualizar a lista de pacotes"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Marcar Actualizável ^g"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^F Esquecer novos pacotes"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Canc^elar acções pendentes"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "Limpar ^Cache de pacotes"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Limpar ficheiros ^obsoletos"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Reler cache de pacotes"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^P Jogar Campo Minado"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^B Tornar-se root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Q Sair"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "Marcar o pacote actualmente seleccionado para instalação ou actualização"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Remover"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Marcar o pacote actualmente seleccionado para remoção"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Purgar"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Marcar o pacote actualmente seleccionado e seus ficheiros de configuração "
 "para serem removidos"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^K Manter"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Cancelar qualquer acção no pacote seleccionado"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^H Manter a Versão"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7624,11 +7578,11 @@ msgstr ""
 "Cancelar qualquer acção no pacote seleccionado e protegê-lo de futuras "
 "actualizações"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Marcar ^Auto"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7636,11 +7590,11 @@ msgstr ""
 "Marcar o pacote seleccionado como tendo sido instalado automaticamente; será "
 "automaticamente removido se nenhum outro pacote depender dele"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Marcar ^Manual"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7648,11 +7602,11 @@ msgstr ""
 "Marcar o pacote seleccionado como tendo sido instalado manualmente; não irá "
 "ser removido a menos que você o remova manualmente"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^F Proibir Versão"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7660,19 +7614,19 @@ msgstr ""
 "Proibir a versão candidata do pacote seleccionado de ser instalada; versões "
 "mais recentes deste pacote serão instaladas como de costume"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformação"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Mostrar mais informações acerca do pacote seleccionado"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "^y Percorrer Informação de Pacote"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7682,61 +7636,61 @@ msgstr ""
 "longa do pacote, um sumário do estado das suas dependências, ou uma análise "
 "acerca da razão porque o pacote é necessário."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Mostrar o 'changelog' Debian do pacote seleccionado"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Examinar Solução"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 "Examine a solução actualmente seleccionada para estes problemas de "
 "dependências."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Aplicar ^Solução"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Executar as acções contidas na solução actualmente seleccionada."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^N Próxima Solução"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Escolha a próxima solução para os problemas de dependências."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "Solução ^Prévia"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Escolha a solução prévia para os problemas de dependências."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^F Primeira Solução"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Escolha a primeira solução para os problemas de dependências."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "Ú^Ltima Solução"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7744,35 +7698,35 @@ msgstr ""
 "Escolha a última solução para os problemas de dependências que foram gerados "
 "até agora."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Alternar ^Rejeitado"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Alternar se a acção actualmente escolhida é rejeitada."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Comutar ^Aprovado"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Alternar se a acção actualmente escolhida é aprovada."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Ver Alvo"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Ver o pacote que será afectado pela acção seleccionada"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Rejeitar Estragar ^Holds (Mantidos)"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7780,137 +7734,137 @@ msgstr ""
 "Rejeitar todas as acções que alterariam o estado dos pacotes mantidos ou "
 "instalariam versões proibidas"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^F Procurar"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Procurar para a frente"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "^F Procurar para trás"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Procurar para trás"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Procurar Nov^amente"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Repetir a última procura"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "^F Procurar Novamente Para Trás"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Repetir a última procura no sentido contrário"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Limitar a vista"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Aplicar um filtro à lista de pacotes"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^U Retirar limite à vista"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Remover o filtro da lista de pacotes"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Procurar Pro^blemáticos"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Procurar o próximo pacote com dependências não satisfeitas"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Preferências"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^UI Opções da interface"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Altera as configurações que afectam a interface do utilizador"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "Lidar com ^Dependências"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Altera as configurações que afectam a forma como as dependências de pacotes "
 "são geridas"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Miscelânea"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Altera as configurações diversas do programa"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Reverter as opções"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Reset a todas as configurações para os padrões do sistema"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^N Próximo"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Visualizar a próxima página"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^P Anterior"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Visualizar a página anterior"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "Fe^char"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Fechar esta página"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Nova ^Visão de Pacote"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Criar uma nova visão de pacote padrão"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Auditar ^Recomendações"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7918,87 +7872,87 @@ msgstr ""
 "Ver pacotes que é recomendado que você instale, mas que actualmente não "
 "estão instalados."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Nova Lista ^Flat de Pacotes"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Ver todos os pacotes no sistema numa lista única sem classificação"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Novo Browser para ^Debtags"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Navegar por pacotes utilizando os dados Debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "^B Novo Navegador de Categorias"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Navega pelos pacotes por categoria"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^A Sobre"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Ver informações acerca deste programa"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^H Ajuda"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Visualiza a ajuda on-line"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Manual do Utilizador"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Ver o manual detalhado do programa"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Novidades"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Ver as alterações importantes feitas em cada versão de "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licença"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Acções"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Procurar"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Opções"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Vistas"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8007,11 +7961,11 @@ msgstr ""
 "%ls: Menu  %ls: Ajuda  %ls: Sair  %ls: Actualizar  %ls: Download/Instalar/"
 "Remover "
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "s"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -8039,9 +7993,50 @@ msgstr "Falhou a transferência do changelog: %s"
 msgid "Downloading the changelog of %s"
 msgstr "A transferir os changelogs"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Só pode ver 'changelogs' de pacotes oficiais Debian."
+#~ msgid "MISSING TAG"
+#~ msgstr "FALTA FAG"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL a utilizar para fazer a transferência dos 'changelogs'"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Esta opção controla o modelo que é utilizado para transferir os "
+#~ "'changelogs' do website Debian.  Só terá de alterar isto se os "
+#~ "'changelogs' mudarem para outro URL."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s não é um pacote oficial Debian, não é possível mostrar o seu "
+#~ "'changelog'."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Não foi possível encontrar nenhum pacote chamado \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Não foi possível processar o padrão %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Esperava um número após -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Esperava um número após -q=, foi obtido %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o necessita de um argumento na forma chave=valor, foi obtido %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "ESTRANHO: recebida uma opção de código desconhecida\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u e -i não podem ser especificadas com um comando"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Só pode ver 'changelogs' de pacotes oficiais Debian."
 
 #~ msgid "Unable to open /usr/share/tasksel/debian-tasks.desc"
 #~ msgstr "Não foi possível abrir /usr/share/tasksel/debian-tasks.desc"
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 443085dc..50480696 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8ca02290..ec1a6b88 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:28+0800\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -367,24 +367,10 @@ msgstr ""
 "de algum dos repositórios no sources.list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL a ser usada para baixar os logs de mudanças"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Esta opção controla o modelo que é usado para baixar os logs de mudanças a "
-"partir do site web do Debian. Você só deveria precisar mudá-la se os logs de "
-"mudanças forem movidos para uma URL diferente."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Exibir uma visualização do que será feito antes de fazê-lo"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -392,14 +378,14 @@ msgstr ""
 "Se esta opção está habilitada, quando você pedir que o aptitude execute uma "
 "instalação, ele primeiro exibirá um sumário das ações que ele realizará."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 "Esquecer quais pacotes são \"novos\" sempre que as listas de pacotes são\n"
 "atualizadas"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -407,14 +393,14 @@ msgstr ""
 "Se esta opção está habilitada, o aptitude limpará a lista de novos pacotes "
 "após você atualizar as listas de pacotes (e.g., pressionando 'u')."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Esquecer quais pacotes são \"novos\" sempre que pacotes são instalados ou\n"
 "removidos"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -424,14 +410,14 @@ msgstr ""
 "após realizar uma instalação ou após instalar ou remover pacotes a partir da "
 "linha de comando."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "Não exibir um aviso quando a primeira mudança é feita em modo\n"
 "somente-leitura"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -441,12 +427,12 @@ msgstr ""
 "você modificar o estado de um pacote se você não tem permissões para aplicar "
 "a mudança ao sistema."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Avisar quando tentar executar uma ação privilegiada como um usuário não-root"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -458,11 +444,11 @@ msgstr ""
 "pacotes como usuário não-root. Será dada a opção de efetuar o log-in como "
 "root e executar a ação com privilégios de root."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Arquivo no qual gravar log de ações"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -474,13 +460,13 @@ msgstr ""
 "\"pipe\" ('%B|%b'), o restante do nome será interpretado como um comando "
 "shell que recebe o log na entrada padrão."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr ""
 "Resolver dependências de um pacote automaticamente quando o mesmo é\n"
 "selecionado"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -493,13 +479,13 @@ msgstr ""
 "embarcado no aptitude, mas pode produzir resultados sub-ótimos ou falhar "
 "completamente em alguns cenários."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Corrigir dependências quebradas automaticamente antes de instalar ou\n"
 "remover"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -511,11 +497,11 @@ msgstr ""
 "sugestão atual do resolvedor de problemas. Caso contrário, o aptitude pedirá "
 "a você uma solução para as dependências quebradas."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Instalar pacotes recomendados automaticamente"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -533,11 +519,11 @@ msgstr ""
 "automaticamente\" está habilitada, pacotes que são recomendados por um "
 "pacote instalado não serão automaticamente removidos."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Remover pacotes não usados automaticamente"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -554,11 +540,11 @@ msgstr ""
 "automaticamente está habilitada, pacotes automaticamente instalados não "
 "serão removidos se qualquer pacote instalado recomendá-los."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Pacotes que nunca deveriam ser automaticamente removidos"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -568,13 +554,13 @@ msgstr ""
 "pacotes instalados dependessem deles: eles nunca serão alvos para remoção "
 "como pacotes não usados."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Permitir resolução de dependências que quebram retidos\n"
 "ou proibidos"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -596,15 +582,15 @@ msgstr ""
 "instalando automaticamente dependências de um pacote que acabou de ser "
 "selecionado para instalação ou atualização, devido a um bug no apt #470035."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Opções da interface"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Gerenciamento de dependências"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Miscelânea"
 
@@ -708,7 +694,7 @@ msgstr "Impossível encontrar o pacote fonte para \"%s\".\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Impossível satisfazer as dependências de construção: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -717,7 +703,7 @@ msgstr ""
 "Nota: \"%s\", fornecendo o pacote virtual\n"
 "      \"%s\", já está instalado.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -726,7 +712,7 @@ msgstr ""
 "Nota: \"%s\", fornecendo o pacote virtual\n"
 "      \"%s\", já será instalado.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -735,17 +721,24 @@ msgstr ""
 "\"%s\" existe na base de dados de pacotes, mas não é\n"
 "um pacote real e nenhum pacote fornece-o.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" é um pacote virtual fornecido por:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Você deve escolher um a ser instalado.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr ""
+"Pacote %s não está instalado, não foi possível proibir uma atualização\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -754,66 +747,58 @@ msgstr ""
 "Nota: selecionando \"%s\" ao invés do\n"
 "      pacote virtual \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s já está instalado na versão requisitada (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s não está atualmente instalado, portanto não será reinstalado.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s já está instalado na versão requisitada (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s não está atualmente instalado, portanto não será reinstalado.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Pacote %s não está instalado, portanto não será removido\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "Pacote %s não está instalado, não foi possível proibir uma atualização\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Pacote %s não é atualizável, não foi possível proibir uma atualização\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Nota: selecionando a tarefa \"%s: %s\" para instalação\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Você só pode especificar uma versão de pacote com um comando 'install' ou "
-"com um comando 'forbid-version'.\n"
+"com um comando 'forbid-version'"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
 msgstr ""
-"Você só pode especificar um repositório de pacotes com um comando "
-"'install'.\n"
+"Você só pode especificar um repositório de pacotes com um comando 'install'"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -822,7 +807,7 @@ msgstr ""
 "Não foi possível encontrar o pacote \"%s\", e mais de 40\n"
 "pacotes contêm \"%s\" em seu nome.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -831,14 +816,14 @@ msgstr ""
 "Não foi possível encontrar o pacote \"%s\". Porém, os\n"
 "pacotes a seguir contêm \"%s\" em seu nome:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Não foi possível encontrar nenhum pacote cujo nome ou descrição combinasse "
 "com \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -856,7 +841,7 @@ msgstr ""
 "Não foi possível encontrar nenhum pacote que combinasse com \"%s\".\n"
 "Porém, os pacotes a seguir contêm \"%s\" em sua descrição:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Caracter de ação ruim '%c'\n"
@@ -879,7 +864,7 @@ msgstr "Err "
 msgid "Changelog download failed: %s"
 msgstr "Log de mudanças de %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "Não foi possível executar o 'sensible-pager', este é um sistema Debian "
@@ -887,97 +872,80 @@ msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s não é um pacote Debian oficial, não foi possível exibir seu log de "
-"mudanças."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Não foi possível encontrar um log de mudanças para %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "Não foi possível encontrar um log de mudanças para %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: O comando 'clean' não aceita argumentos\n"
+msgid "The clean command takes no arguments"
+msgstr "O comando 'clean' não aceita argumentos"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Exc %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr ""
 "Impossível procurar em seu diretório pessoal, salvando em /tmp/function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Exc %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: O comando 'autoclean' não aceita argumentos\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "O comando 'autoclean' não aceita argumentos"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Seriam liberados %sB de espaço em disco\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Liberados %sB de espaço em disco\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operação %s inválida"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Argumento de padrão inesperado seguindo \"keep-all\""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "Impossível resolver dependências de forma segura, tente executar com --full-"
-"resolver.\n"
+"resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Abortar.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "baixar: você deve especificar pelo menos um pacote a ser baixado\n"
+msgid "download: you must specify at least one package to download"
+msgstr "baixar: você deve especificar pelo menos um pacote a ser baixado"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Não foi possível ler a lista de fontes"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Não foi possível encontrar um pacote chamado \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1017,33 +985,24 @@ msgid "[Working]"
 msgstr "[Trabalhando]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 "extract-cache-entries: no mínimo um arquivo é requerido (o diretório no qual "
-"escrever os arquivos).\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Nenhum pacote \"%s\""
+"escrever os arquivos)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 "Nenhum pacote foi selecionado pelo padrão de pesquisa dado; nada a fazer.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: O comando 'forget-new' não aceita argumentos\n"
+msgid "The forget-new command takes no arguments"
+msgstr "O comando 'forget-new' não aceita argumentos"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Esqueceria quais pacotes são novos\n"
@@ -1152,17 +1111,17 @@ msgstr "Os pacotes a seguir serão atualizados:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Os pacotes a seguir, parcialmente instalados, serão configurados:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Os pacotes ESSENCIAIS a seguir serão REMOVIDOS!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Os pacotes ESSENCIAIS a seguir ficarão QUEBRADOS por esta ação:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1171,16 +1130,16 @@ msgstr ""
 "AVISO: Executar esta ação provavelmente fará com que seu sistema quebre!\n"
 "       NÃO continue a menos que você saiba EXATAMENTE o que está fazendo!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Estou ciente de que esta é um idéia muito ruim."
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Para continuar, digite a frase \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1197,7 +1156,7 @@ msgstr ""
 "que isso é realmente o que você deseja fazer.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1207,7 +1166,7 @@ msgstr ""
 "                %s::CmdLine::Ignore-Trust-Violations está\n"
 "                definido com o valor 'true'!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1221,7 +1180,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1230,99 +1189,99 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Você deseja ignorar este aviso e continuar mesmo assim?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Para continuar, digite \"%s\"; para abortar, digite \"%s\":"
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Entrada desconhecida. Informe \"%s\" ou \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Os pacotes a seguir foram RECOMENDADOS mas NÃO serão instalados:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Os pacotes a seguir foram SUGERIDOS mas NÃO serão instalados:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Nenhum pacote será instalado, atualizado ou removido.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pacotes atualizados, %lu novos instalados, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalados, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu revertidos, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu a serem removidos e %lu não atualizados.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "É preciso obter %sB/%sB de arquivos. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "É preciso obter %sB de arquivos. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Depois do desempacotamento, %sB serão usados.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Depois do desempacotamento, %sB serão liberados.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Nenhum pacote para mostrar -- informe os nomes dos pacotes na linha após "
 "'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Pressione Enter para continuar."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Nenhum pacote encontrado -- informe os nomes dos pacotes na linha após 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1331,30 +1290,30 @@ msgstr ""
 "Nenhuma pacote encontrado -- informe zero ou mais raízes da busca seguidos "
 "pelo pacote para justificar.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "continuar com a instalação"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "abortar e sair"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1362,12 +1321,12 @@ msgstr ""
 "mostrar informação sobre um ou mais pacotes; os nomes dos pacotes deveriam "
 "vir após o 'i'"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1375,39 +1334,39 @@ msgstr ""
 "exibir os logs de mudanças Debian de um ou mais pacotes; os nomes dos "
 "pacotes deveriam vir após o 'c'"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "alternar a exibição de informações de dependências"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "alternar a exibição de mudanças nos tamanhos dos pacotes"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "alternar a exibição dos números de versão"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1415,27 +1374,27 @@ msgstr ""
 "tente encontrar uma razão para instalar um único pacote, ou explique por que "
 "a instalação de um pacote deveria levar à instalação de outro pacote."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "execute o resolvedor automático de dependências para consertar as "
 "dependências quebradas."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "entrar na interface visual completa"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1447,47 +1406,47 @@ msgstr ""
 "pacotes (ou padrões). A ação será aplicada a todos os pacotes que você "
 "listar. As seguintes ações estão disponíveis:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' para instalar pacotes"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M' para instalar pacotes e imediatamente marcá-los como instalados "
 "automaticamente."
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' para remover pacotes"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' para expurgar (\"purge\") pacotes"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' para reter (\"hold\") pacotes"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':' para manter pacotes em seus estados atuais sem retê-los (\"hold\")"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' para marcar pacotes como automaticamente instalados"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' para marcar pacotes como manualmente instalados"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "'&BD' para instalar as dependências de construção de um pacote."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1495,29 +1454,29 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' para marcar pacotes como automaticamente instalados"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Comandos:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1525,20 +1484,20 @@ msgstr ""
 "O aptitude falhou em encontrar uma solução para estas dependências. Você "
 "pode resolvê-las por conta própria manualmente ou digitar 'n' para sair."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Você deseja continuar? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Resolver estas dependências manualmente? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Resposta inválida. Por favor, informe um comando válido ou '?' para ajuda.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1547,7 +1506,7 @@ msgstr ""
 "instalar um pacote), 'R' para tentar resolução automática de dependências ou "
 "'N' para abortar."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1558,7 +1517,7 @@ msgstr ""
 "Informações de dependências serão exibidas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1569,7 +1528,7 @@ msgstr ""
 "Informações de dependências não serão exibidas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1580,7 +1539,7 @@ msgstr ""
 "Versões serão exibidas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1591,7 +1550,7 @@ msgstr ""
 "Versões não serão exibidas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1602,7 +1561,7 @@ msgstr ""
 "Mudanças de tamanho serão exibidas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1739,6 +1698,11 @@ msgstr "Esperado pelo menos um par pacote/versão após '%c'"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Esperada uma versão ou \"%s\" após \"%s\""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Nenhum pacote \"%s\""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1889,7 +1853,7 @@ msgstr ""
 "Eu quero resolver dependências, mas nenhum resolvedor de dependências foi "
 "criado."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1919,7 +1883,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Os comandos a seguir estão disponíveis:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Arquivo onde escrever o estado do resolvedor: "
 
@@ -1954,7 +1918,7 @@ msgstr ""
 "          continuar pesquisando, mas algumas soluções serão\n"
 "          inalcançáveis."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1963,27 +1927,26 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Impossível resolver dependências para a atualização (nenhuma solução "
 "encontrada)."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Impossível resolver dependências para a atualização (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "iconv de %s falhou.\n"
+msgid "iconv of %s failed"
+msgstr "iconv de %s falhou"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "busca: Você deve fornecer pelo menos um termo para busca\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "busca: Você deve fornecer pelo menos um termo para busca"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2026,7 +1989,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Os pacotes a seguir possuem dependências não satisfeitas:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULO>"
@@ -2249,7 +2212,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Fornece"
 
@@ -2263,15 +2226,9 @@ msgstr "Descrição: "
 msgid "Homepage: "
 msgstr "Página web: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Impossível localizar pacote %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Impossível interpretar padrão %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Nenhum pacote encontrado"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2282,14 +2239,13 @@ msgstr "Baixaria/instalaria/removeria pacotes.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Erro Interno, Ordenação não finalizou"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Apagando arquivos baixados obsoletos"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: O comando 'update' não aceita argumentos\n"
+msgid "The update command takes no arguments"
+msgstr "O comando 'update' não aceita argumentos"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2307,133 +2263,155 @@ msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 "%s: poucos argumentos; esperado pelo menos um nome de tag e um pacote.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Nenhuma versão candidata para %s\n"
+msgid "No candidate version found for %s"
+msgstr "Nenhuma versão candidata para %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Nenhuma versão atual ou candidata encontrada para %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "Nenhuma versão atual ou candidata encontrada para %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Impossível encontrar um repositório \"%s\" para o pacote \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Impossível encontrar um repositório \"%s\" para o pacote \"%s\""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Impossível encontrar uma versão \"%s\" para o pacote \"%s\"\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Impossível encontrar uma versão \"%s\" para o pacote \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Erro interno: valor %i inválido passado para cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Erro interno: valor %i inválido passado para cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
 msgstr ""
-"Você não pode especificar ambos um repositório e uma versão para um pacote\n"
-
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Não foi possível encontrar um log de mudanças para %s"
+"Você não pode especificar ambos um repositório e uma versão para um pacote"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d quebrado [%+d]"
 msgstr[1] "%d quebrados [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d atualizado [%+d]"
 msgstr[1] "%d atualizados [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d novo [%+d]"
 msgstr[1] "%d novos [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Estado atual: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "Há %d pacote que recentemente tornou-se obsoleto."
 msgstr[1] "Há %d pacotes que recentemente tornaram-se obsoletos."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "Há %d pacote que recentemente tornou-se obsoleto: "
 msgstr[1] "Há %d pacotes que recentemente tornaram-se obsoletos: "
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Sem vírgula após o nome da tag \"%s\""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Impossível localizar pacote %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Não foi possível encontrar um log de mudanças para %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Nota: selecionando a tarefa \"%s: %s\" para instalação\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Não foi possível encontrar um log de mudanças para %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Pacotes"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Pacote Fonte: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "Repositório"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "busca: Você deve fornecer pelo menos um termo para busca\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2456,7 +2434,7 @@ msgstr "Atual"
 msgid "Candidate"
 msgstr "Candidato"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Instalar"
 
@@ -2558,23 +2536,20 @@ msgstr "Impossível encontrar uma razão para instalar %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Pacotes que dependem de %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Não existe um pacote chamado \"%s\"."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Impossível interpretar alguns padrões."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
-"%s: este comando requer pelo menos um argumento (o pacote a ser "
-"consultado).\n"
+"%s: este comando requer pelo menos um argumento (o pacote a ser consultado)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2600,11 +2575,11 @@ msgstr "NÃO SATISFEITAS"
 msgid "UNAVAILABLE"
 msgstr "NÃO DISPON�VEIS"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Tags"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Tags de Usuário"
 
@@ -2814,32 +2789,32 @@ msgstr ""
 "somente-leitura; quaisquer mudanças que você fizer nos estados dos pacotes "
 "NÃO serão preservadas!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 msgid "allowed"
 msgstr "allow_choices"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "principal"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2906,36 +2881,44 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "O cache de pacotes não está disponível; impossível baixar e instalar pacotes."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 "Erro interno: não foi possível gerar a lista de pacotes a serem baixados"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Falhou ao obter %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Impossível buscar alguns arquivos, talvez executar aptitude update ou tentar "
+"com --fix-missing?"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Não é possível corrigir para pacotes não disponíveis"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "A instalação de um pacote falhou. Tentando recuperar:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3085,13 +3068,13 @@ msgstr ""
 "\n"
 "Log completo.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "Baixando pacotes"
@@ -3205,18 +3188,18 @@ msgstr ""
 "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:"
 "\" para o pacote %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Log de mudanças de %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "URL a ser usada para baixar os logs de mudanças"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL a ser usada para baixar os logs de mudanças"
@@ -3266,26 +3249,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Impossível interpretar padrão %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Construindo o banco de dados de tags"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "Não Instalado"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "Não Instalado"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3433,41 +3417,41 @@ msgstr ""
 msgid "_File"
 msgstr "Falso"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Executar todas as instalações e remoções pendentes"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Checar por novas versões de pacotes"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Marcar para atualização todos os pacotes atualizáveis que não estejam retidos"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Esquecer quais pacotes são \"novos\""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Cancelar todas as instalações, remoções, retenções e atualizações pendentes."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Excluir arquivos de pacotes que foram previamente baixados"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Excluir arquivos de pacotes que não podem mais ser baixados"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Recarregar o cache de pacotes"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3477,7 +3461,7 @@ msgstr ""
 "Executar 'su' para tornar-se root; isto irá reiniciar o programa, mas suas "
 "configurações serão preservadas"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Sair do programa"
 
@@ -3485,7 +3469,7 @@ msgstr "Sair do programa"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Desfaz a última operação ou grupo de operações do pacote"
 
@@ -3519,7 +3503,7 @@ msgid "_Help"
 msgstr "Ajuda"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3528,19 +3512,19 @@ msgstr ""
 msgid "Update"
 msgstr "Atualização da lista"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Pacotes"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Pré-visualização"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Resolvedor"
 
@@ -3727,7 +3711,7 @@ msgid "Fix Manually"
 msgstr "Manual"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Atualizar"
 
@@ -4262,11 +4246,11 @@ msgstr "Instalado"
 msgid "Reinstall"
 msgstr "Reinstalar"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Reverter"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Remover"
 
@@ -4302,7 +4286,7 @@ msgstr "Aplicar um filtro à lista de pacotes"
 msgid "Download already running."
 msgstr "Fazendo download..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Uma atualização da lista de pacotes ou instalação já está em execução."
 
@@ -4363,38 +4347,38 @@ msgstr "Nenhum pacote quebrado."
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Impossível substituir %s pelo novo arquivo de configuração"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Baixando pacotes"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "Nenhum pacote quebrado."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "Nenhum pacote quebrado."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "Resolver dependências"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Nenhum pacote está quebrado."
 msgstr[1] "Nenhum pacote está quebrado."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s mudanças"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s mudanças"
@@ -4402,7 +4386,7 @@ msgstr "%s mudanças"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4412,64 +4396,64 @@ msgstr[1] "%d instalação"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "falhou ao remover %s"
 msgstr[1] "falhou ao remover %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "TamanhoDownload"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "não instalado"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "Instalado"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "Ex^purgar"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Manter"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Reter"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "Manual do Usuário"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4509,7 +4493,7 @@ msgstr "não"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4554,17 +4538,17 @@ msgstr "%s; serão automaticamente instalados"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "Pesquisar"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "Construindo visão"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Construindo visão"
@@ -5268,108 +5252,109 @@ msgstr "Tipo de alinhamento '%s' desconhecido"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Políticas de ordenação por nome não aceitam argumentos"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Nome de política de ordenação de tamanho zero inválido"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "'(' sem par na descrição da política de ordenação"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Tipo de política de ordenação '%s' inválido"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Não foi possível decodificar string multibyte após \"%ls\""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Não foi possível decodificar string wide-character após \"%s\""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilado em %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilador: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Compilado contra:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr " versão apt %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  Versão NCurses: Desconhecida\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  Versão NCurses: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  versão libsigc++: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Suporte a ept habilitado.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Suporte a ept desabilitado.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr " versão apt %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr " versão apt %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Suporte a ept desabilitado.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s compilado em %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Suporte a ept desabilitado.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5377,32 +5362,32 @@ msgstr ""
 "\n"
 "Versões atuais das bibliotecas:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  Versão NCurses: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  versão cwidget: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Versão apt: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Uso: aptitude [-S arquivo] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [opções] <ação> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5412,44 +5397,44 @@ msgstr ""
 "interativo):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instala/atualiza pacotes.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Remove pacotes.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Remove pacotes e seus arquivos de configuração.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Coloca pacotes em retenção (\"hold\").\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Cancela o comando 'hold' para um pacote.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 " markauto     - Marca pacotes como tendo sido automaticamente instalados.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr ""
 " unmarkauto   - Marca pacotes como tendo sido manualmente instalados.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5458,17 +5443,17 @@ msgstr ""
 " forbid-version - Proíbe o aptitude de atualizar para uma versão específica\n"
 "                  do pacote.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Baixa as listas de pacotes novos/atualizáveis.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Executa uma atualização segura.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5478,52 +5463,52 @@ msgstr ""
 "removendo\n"
 "                pacotes.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' para instalar as dependências de construção de um pacote."
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Esquece quais pacotes são \"novos\".\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Pesquisa por um pacote pelo nome e/ou expressão.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Exibe informações detalhadas sobre um pacote.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Exibe informações detalhadas sobre um pacote\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Apaga arquivos de pacotes baixados.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Apaga arquivos antigos de pacotes baixados.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Visualiza o log de mudanças de um pacote.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Baixa do arquivo .deb de um pacote.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5531,7 +5516,7 @@ msgid ""
 msgstr ""
 " reinstall    - Baixa e (possivelmente) reinstala um pacote já instalado.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5542,7 +5527,7 @@ msgstr ""
 "                pacote, ou mostra por que um ou mais pacotes precisariam\n"
 "                do pacote dado.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5555,55 +5540,55 @@ msgstr ""
 "                pacotes levariam a um conflito com o pacote dado, se\n"
 "                instalado.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opções:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Este texto de ajuda.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Este texto de ajuda\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simular ações, mas não executá-las de verdade.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr " -d             Somente baixa pacotes, não instala ou remove nada.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Sempre pedir por confirmação ou ações.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5611,7 +5596,7 @@ msgstr ""
 " -y             Assume que a resposta para perguntas simples sim/não é "
 "'sim'.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5620,7 +5605,7 @@ msgstr ""
 " -F formato     Especifica um formato para exibição dos resultados da\n"
 "                pesquisa; veja o manual.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5630,7 +5615,7 @@ msgstr ""
 "ordenados;\n"
 "                veja o manual.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
@@ -5638,17 +5623,17 @@ msgstr ""
 " -w largura      Especifica a largura de exibição para formatar resultados\n"
 "                 de busca.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Tenta agressivamente corrigir pacotes quebrados.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Mostra quais versões de pacotes serão instaladas.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -5656,13 +5641,13 @@ msgstr ""
 " -D             Mostra as dependências dos pacotes modificados "
 "automaticamente.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 " -Z             Mostra a mudança no tamanho instalado de cada pacote.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5671,7 +5656,7 @@ msgstr ""
 " -v             Exibe informação extra. (pode ser fornecido múltiplas "
 "vezes).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
@@ -5679,7 +5664,7 @@ msgstr ""
 " -t [release]   Define de qual distribuição os pacotes devem ser "
 "instalados.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5688,14 +5673,14 @@ msgstr ""
 " -q             Em modo linha de comando, suprime os indicadores de\n"
 "                progresso incremental.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o chave=val   Definir diretamente a opção de configuração chamada "
 "'chave'.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5704,160 +5689,140 @@ msgstr ""
 " --with(out)-recommends\tEspecifica se as recomendações devem ou não ser\n"
 "                tratadas como dependências fortes.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S arquivo     Lê a informação de estado estendida do aptitude do arquivo.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Baixa novas lista de pacotes ao iniciar.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             Este texto de ajuda\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Executa uma ação de instalação ao iniciar.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Este aptitude não contém Poderes de Super Vaca.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 msgid "trace"
 msgstr "verdadeiro"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 msgid "info"
 msgstr "não"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 msgid "error"
 msgstr "Err "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "falso"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Operação %s inválida"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Esperado um número após -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Esperado um número após -q=, obtido %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o requer um argumento na forma chave=valor, obtido %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Sem vírgula após o nome da tag \"%s\".\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "ESTRANHEZA: recebida opção de código desconhecida\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "Pacote"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "Todos os pacotes"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5865,38 +5830,33 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Somente uma das opções -u e -i pode ser especificada\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u e -i não podem ser especificadas em modo de linha de comando (por "
 "exemplo, com 'install')"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u e -i não podem ser especificados com um comando"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Comando desconhecido \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Comando desconhecido \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Exceção não capturada: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5914,7 +5874,7 @@ msgstr "Pesquisar por: "
 msgid "Search backwards for: "
 msgstr "Pesquisar regressivamente por: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Campo Minado"
 
@@ -6126,7 +6086,7 @@ msgstr "Codificação de mine-help-pt_BR.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 14 30 20 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Pacote"
 
@@ -6207,8 +6167,8 @@ msgstr "<N/D>"
 msgid "<none>"
 msgstr "<nenhum>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtual"
@@ -6342,7 +6302,7 @@ msgstr "Impossível transcodificar formato de exibição de pacote após \"%ls\"
 msgid "Internal error: Default column string is unparsable"
 msgstr "Erro interno: String de coluna padrão não é analisável"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Tarefas"
 
@@ -6500,11 +6460,11 @@ msgstr "�ndices combinados devem ser 1 ou maior, não \"%s\""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "�ndice combinado %ls é muito grande; grupos disponíveis são (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PACOTES SEM TAGS"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6515,10 +6475,6 @@ msgstr ""
 "do debtags não está presente (instalar o debtags pode corrigir este "
 "problema)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "TAG FALTANDO"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Pacote Fonte: "
@@ -7141,7 +7097,7 @@ msgstr "Carregando cache"
 msgid "Really quit Aptitude?"
 msgstr "Realmente sair do Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Muda o comportamento do aptitude"
 
@@ -7222,7 +7178,7 @@ msgstr ""
 msgid "License"
 msgstr "Licença"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 "Visualizar os termos sob os quais você pode copiar e distribuir o aptitude"
@@ -7244,7 +7200,7 @@ msgstr "Ajuda on-line"
 msgid "View a brief introduction to aptitude"
 msgstr "Veja uma pequena introdução ao aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Ajuda"
 
@@ -7273,7 +7229,7 @@ msgstr "Manual"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Visualizar uma lista de perguntas feitas freqüentemente"
 
@@ -7316,15 +7272,15 @@ msgstr ""
 "deseja remover esse diretório e todo seu conteúdo? Se você selecionar \"Não"
 "\", você não verá esta mensagem novamente."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Visualizar o progresso dos pacotes sendo baixados"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Baixar Pacote"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7336,35 +7292,35 @@ msgstr ""
 "Você só deveria prosseguir com a instalação se estiver certo de que isso é "
 "realmente o que deseja fazer.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versão %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Realmente continuar"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Abortar instalação"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Visualização da instalação de pacotes"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Visualizar e/ou ajustar as ações que serão executadas"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Alguns pacotes estavam quebrados e foram consertados:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Nenhuma solução para estes problemas de dependência existe!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7373,7 +7329,7 @@ msgstr ""
 "Tempo esgotado na tentativa de resolver dependências (pressione \"%s\" para "
 "tentar de maneira mais agressiva)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7381,20 +7337,20 @@ msgstr ""
 "Instalar/remover pacotes requer privilégios administrativos, os quais você "
 "atualmente não possui. Você gostaria de mudar para a conta de root?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Tornar-se root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Não tornar-se root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "Nenhum pacote está agendado para ser instalado, removido ou atualizado."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7404,19 +7360,19 @@ msgstr ""
 "poderiam ser atualizados, mas você optou por não atualizá-los. Digite \"U\" "
 "para preparar uma atualização."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Atualizando as listas de pacotes"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Visualizar o progresso da atualização da lista de pacotes"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Atualização da lista"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7424,23 +7380,23 @@ msgstr ""
 "Atualizar a lista de pacotes requer privilégios administrativos, os quais "
 "você atualmente não possui. Você gostaria de mudar para a conta de root?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Perca tempo tentando encontrar minas"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Limpar enquanto um download está em progresso não é permitido"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Apagando arquivos baixados"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Arquivos de pacotes baixados foram apagados"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7449,11 +7405,11 @@ msgstr ""
 "Atualizar a lista de pacotes requer privilégios administrativos, os quais "
 "você atualmente não possui. Você gostaria de mudar para a conta de root?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "O arquivo de cache do apt não está disponível, não posso auto-limpar."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7462,7 +7418,7 @@ msgstr ""
 "Arquivos de pacotes baixados obsoletos foram apagados, liberando %sB de "
 "espaço em disco."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7471,123 +7427,123 @@ msgstr ""
 "Atualizar a lista de pacotes requer privilégios administrativos, os quais "
 "você atualmente não possui. Você gostaria de mudar para a conta de root?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Sem mais soluções."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Impossível encontrar uma solução a ser aplicada."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Tempo esgotado na tentativa de encontrar uma solução."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Resolver dependências"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Procurar por soluções para dependências não satisfeitas"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Impossível abrir %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Erro descarregando o estado do resolvedor"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Instalar/remover pacotes"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "At^ualizar a lista de pacotes"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Marcar atualizáveis (^g)"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "Esquecer novos pacotes (^F)"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Canc^elar ações pendentes"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "Limpar ^cache de pacotes"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Limpar arquivos ^obsoletos"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Recarregar cache de pacotes"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "Jogar cam^po minado"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Tornar-se root (^B)"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "Sair (^Q)"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Desfazer"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Instalar"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Marcar o pacote atualmente selecionado para instalação ou atualização"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Remover"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Marcar o pacote atualmente selecionado para remoção"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "Ex^purgar"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Marcar o pacote atualmente selecionado e seus arquivos de configuração para "
 "remoção"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "Manter (^K)"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Cancelar quaisquer ações nos pacotes selecionados"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "Reter (^H)"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7595,11 +7551,11 @@ msgstr ""
 "Cancelar quaisquer ações nos pacotes selecionados e protegê-los de "
 "atualizações futuras"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Marcar ^auto"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7607,11 +7563,11 @@ msgstr ""
 "Marcar o pacote selecionado como tendo sido automaticamente instalado; ele "
 "será automaticamente removido caso nenhum outro pacote dependa dele"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Marcar ^manual"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7619,11 +7575,11 @@ msgstr ""
 "Marcar o pacote selecionado como tendo sido manualmente instalado; ele não "
 "será removido a menos que você o remova manualmente"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "Proibir versão (^F)"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7631,19 +7587,19 @@ msgstr ""
 "Proibir a instalação da versão candidata do pacote selecionado; novas "
 "versões do pacotes serão instaladas normalmente"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformações"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Exibir maiores informações sobre o pacote selecionado"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "Percorrer informações (^y)"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7653,61 +7609,61 @@ msgstr ""
 "a descrição longa do pacote, um sumário de seu estado de dependências, ou "
 "uma análise de por que o pacote é requerido."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "Log de mudanças (^C)"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Exibir o log de mudanças Debian do pacote selecionado"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Examinar solução"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 "Examinar a atualização atualmente selecionada com relação aos problemas de "
 "dependência."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Aplicar ^solução"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Executar as ações contidas na solução atualmente selecionada."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "Próxima solução (^N)"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Seleciona a próxima solução para os problemas de dependência."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "Solução anterior (^P)"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Seleciona a solução anterior para os problemas de dependência."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "Primeira solução (^F)"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Seleciona a primeira solução para os problemas de dependência."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "Ú^ltima solução"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7715,35 +7671,35 @@ msgstr ""
 "Seleciona a última solução para os problemas de dependência que foi gerada "
 "até o momento."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "^Rejeitar ação"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Define se a ação atualmente selecionada é rejeitada."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "^Aprovar ação"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Define se a ação atualmente selecionada é aprovada."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Visualizar alvo"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Visualizar o pacote que será afetado pela ação selecionada"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Rejeitar quebrando retidos (^H)"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7751,136 +7707,136 @@ msgstr ""
 "Rejeitar todas as ações que mudariam o estado dos pacotes retidos ou "
 "instalariam versões proibidas"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "Localizar (^F)"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Pesquisa progressiva"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "Localizar regressivamente (^F)"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Pesquisa regressiva"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Loc^alizar novamente"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Repetir a última pesquisa"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Localizar novamente regressivo (^B)"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Repetir a última pesquisa na direção oposta"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Limitar exibição"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Aplicar um filtro à lista de pacotes"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "Não limitar a exibição (^U)"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Remover o filtro da lista de pacotes"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Localizar que^brado"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Encontra o próximo pacote com dependências não satisfeitas"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Preferências"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "Opções da Interface de ^Usuário"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Muda as configurações que afetam a interface do usuário"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "Gerencimento de ^Dependências"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Muda as configurações que afetam como as dependências de pacotes são tratadas"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Miscelânea"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Muda as configurações \"miscelâneas\" do programa"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Reverter opções"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Reverte todas as configurações para os padrões do sistema"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "Próximo (^N)"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Visualizar próxima tela"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "Anterior (^P)"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Visualizar tela anterior"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "Fe^char"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Fechar esta tela"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Nova ^visão de pacote"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Criar uma nova visão de pacotes padrão"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Auditar ^recomendações"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7888,88 +7844,88 @@ msgstr ""
 "Visualizar pacotes recomendados para instalação, mas que não estão "
 "instalados no momento."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Nova lista de pacotes plana (^F)"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 "Visualizar todos os pacotes no sistema em uma única lista não categorizada"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Novo navegador ^Debtags"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Navega pelos pacotes usando dados Debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Novo navegador categórico (^B)"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Navega pelos pacotes por categoria"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "Sobre (^A)"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Visualiza informações sobre este programa"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "Ajuda (^H)"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Visualizar a ajuda on-line"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Manual do Usuário"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Visualizar o manual do programa detalhado"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Notícias"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Visualizar as mudanças importantes feitas em cada versão de "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licença"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Ações"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Pesquisar"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Opções"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Visões"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7978,11 +7934,11 @@ msgstr ""
 "%ls: Menu  %ls: Ajuda  %ls: Sai  %ls: Atualiza  %ls: Baixar/Instalar/Remover "
 "Pcts."
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "s"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -8010,9 +7966,51 @@ msgstr "URL a ser usada para baixar os logs de mudanças"
 msgid "Downloading the changelog of %s"
 msgstr "Baixando logs de mudanças"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Você só pode visualizar logs de mudanças de pacotes Debian oficiais."
+#~ msgid "MISSING TAG"
+#~ msgstr "TAG FALTANDO"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL a ser usada para baixar os logs de mudanças"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Esta opção controla o modelo que é usado para baixar os logs de mudanças "
+#~ "a partir do site web do Debian. Você só deveria precisar mudá-la se os "
+#~ "logs de mudanças forem movidos para uma URL diferente."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s não é um pacote Debian oficial, não foi possível exibir seu log de "
+#~ "mudanças."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Não foi possível encontrar um pacote chamado \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Impossível interpretar padrão %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Esperado um número após -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Esperado um número após -q=, obtido %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o requer um argumento na forma chave=valor, obtido %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "ESTRANHEZA: recebida opção de código desconhecida\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u e -i não podem ser especificados com um comando"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr ""
+#~ "Você só pode visualizar logs de mudanças de pacotes Debian oficiais."
 
 #~ msgid "Unable to open /usr/share/tasksel/debian-tasks.desc"
 #~ msgstr "Impossível abrir /usr/share/tasksel/debian-tasks.desc"
@@ -8188,11 +8186,6 @@ msgstr "Você só pode visualizar logs de mudanças de pacotes Debian oficiais."
 #~ msgstr "Baixando logs de mudanças"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Nenhuma resolução encontrada."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Não foi possível abrir o arquivo de hierarquia de pacotes %s"
diff --git a/po/ro.gmo b/po/ro.gmo
index 6884c4df..24415507 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
diff --git a/po/ro.po b/po/ro.po
index d1f0f206..97800960 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-05-23 10:14+0800\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -374,25 +374,11 @@ msgstr ""
 "precizate în sources.list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL de folosit la descărcarea jurnalelor de modificări"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Această opțiune controlează șablonul utilizat atunci când se descarcă "
-"jurnalele de modificări de pe situl Debian. Va trebui să schimbați aceasta "
-"doar dacă jurnalele se mută la o altă adresă."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr ""
 "Afișează o previzualizare a ceea ce va fi făcut inainte de a fi executat"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -401,14 +387,14 @@ msgstr ""
 "facă o instalare, aptitude va afișa mai întâi un sumar al acțiunilor ce "
 "urmează să fie făcute."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 "Uită care pachete sunt \"noi\" de câte ori listele cu pachete sunt "
 "actualizate"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -417,14 +403,14 @@ msgstr ""
 "pachete (ex. prin apăsarea tastei „u�), aptitude va șterge lista de pachete "
 "noi."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Uită care pachete sunt \"noi\" de câte ori pachetele sunt instalate sau "
 "șterse"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -433,13 +419,13 @@ msgstr ""
 "Dacă se activează această opțiune, atunci, după o instalare sau ștergere "
 "dată din linia de comandă, aptitude va șterge lista de pachete noi."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "Nu afișa un avertisment când prima schimbare este făcută în modul doar-citire"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -449,13 +435,13 @@ msgstr ""
 "avertisment dacă nu aveți drepturi suficiente pentru a aplica schimbările "
 "asupra sistemului."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Avertizează când se încearcă folosirea unei acțiuni privilegiate de către un "
 "utilizator non-root"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -468,11 +454,11 @@ msgstr ""
 "se va oferi posibilitatea să vă autentificați ca „root� și să efectuați "
 "acțiunea cu drepturi de root."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Fișierul în care se vor înregistra acțiunile"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -484,11 +470,11 @@ msgstr ""
 "fișierului este caracterul „pipe� („%B|%b�), atunci restul numelui va fi "
 "interpretat ca fiind o comandă ce va primi jurnalul la intrarea standard."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Rezolvă automat dependențele unui pachet atunci când este selectat"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -500,11 +486,11 @@ msgstr ""
 "Această metodă este mult mai rapidă decât rezolvatorul intern, dar poate "
 "produce rezultate suboptime sau chiar să eșueze total, dependent de situație."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "Repară automat pachetele deteriorate înainte de instalare sau ștergere"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -516,11 +502,11 @@ msgstr ""
 "curente în algoritmul de rezolvare a problemelor. Altfel, aptitude va "
 "aștepta să alegeți o soluție pentru dependențele deteriorate."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Instalează automat pachetele recomandate"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -538,11 +524,11 @@ msgstr ""
 "nefolosite� este activată, pachetele care sunt recomandate cel puțin de un "
 "pachet instalat nu vor fi șterse automat."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Șterge automat pachetele nefolosite"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -559,11 +545,11 @@ msgstr ""
 "recomandate� este activată, pachetele instalate automat, care sunt "
 "recomandate cel puțin de un pachet instalat, nu vor fi șterse automat."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Pachete care n-ar trebui niciodată șterse automat"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -573,12 +559,12 @@ msgstr ""
 "ca și cum un pachet instalat depinde de ele: nu vor fi niciodată ținta "
 "ștergerilor pe motiv că sunt nefolosite."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Permite rezolvări de dependențe care ignoră păstrările sau interdicțiile"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -600,15 +586,15 @@ msgstr ""
 "atunci când instalează automat dependențele unui pachet care tocmai a fost "
 "selectat să fie instalat sau înnoit."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Opțiuni pentru interfață"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Manevrarea dependențelor"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Diverse"
 
@@ -717,7 +703,7 @@ msgstr "Nu s-a putut găsi pachetul sursă pentru „%s�.\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Nu se pot satisface dependențele la compilare: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -726,7 +712,7 @@ msgstr ""
 "Notă: „%s�, furnizează pachetul virtual\n"
 "      „%s�, este deja instalat.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -735,7 +721,7 @@ msgstr ""
 "Notă: „%s�, furnizează pachetul virtual\n"
 "      „%s�, este deja pe cale să fie instalat.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -744,17 +730,23 @@ msgstr ""
 "„%s� există în baza de date a pachetelor, dar nu este\n"
 "un pachet adevărat și nici un pachet nu-l furnizează.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "„%s� este un pachet virtual furnizat de:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Trebuie să alegeți unul pentru instalare.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "Pachetul %s nu este instalat, nu se poate interzice o înnoire\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -763,64 +755,57 @@ msgstr ""
 "Notă: se alege „%s� în locul\n"
 "      pachetului virtual „%s�\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s este deja instalat cu versiunea cerută (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 "%s nu este instalat în momentul de față, astfel încât nu va fi reinstalat.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s este deja instalat cu versiunea cerută (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 "%s nu este instalat în momentul de față, astfel încât nu va fi reinstalat.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Pachetul %s nu este instalat, astfel încât nu va fi șters\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Pachetul %s nu este instalat, nu se poate interzice o înnoire\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Pachetul %s nu poate fi înnoit, nu se poate interzice o înnoire\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Notă: alegerea sarcinii \"%s: %s\" pentru instalare\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Puteți specifica o versiune de pachet doar cu comanda 'install' sau cu "
-"'forbid-version'.\n"
+"'forbid-version'"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Puteți specifica o arhivă de pachet doar cu comanda 'install'.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Puteți specifica o arhivă de pachet doar cu comanda 'install'"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -829,7 +814,7 @@ msgstr ""
 "Nu s-a putut găsi pachetul „%s�, și mai mult de 40 de\n"
 "pachete conțin „%s� în nume.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -838,14 +823,14 @@ msgstr ""
 "Nu s-a putut găsi pachetul „%s�. Totuși, următoarele\n"
 "pachete conțin „%s� în numele lor:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Nu s-a putut găsi nici un pachet al cărui nume sau descriere să se\n"
 "potrivească cu „%s�\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -863,7 +848,7 @@ msgstr ""
 "Nu s-a putut găsi nici un pachet care să se potrivească cu „%s�.\n"
 "Totuși, următoarele pachete conțin „%s� în descrierea lor:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Caracter de acțiune necorespunzător „%c�\n"
@@ -886,104 +871,86 @@ msgstr "Er "
 msgid "Changelog download failed: %s"
 msgstr "Jurnal de modificări al lui %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "Nu se poate executa sensible-pager, acesta este un sistem Debian funcțional?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s nu este un pachet Debian oficial, nu se poate afișa jurnalul său de "
-"modificări."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Nu s-a putut găsi un jurnal de modificări pentru %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "Nu s-a putut găsi un jurnal de modificări pentru %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: Comanda „clean� nu are argumente\n"
+msgid "The clean command takes no arguments"
+msgstr "Comanda „clean� nu are argumente"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Ștergere %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr ""
 "Nu s-a putut găsi directorul dumneavoastră personal, se salvează în /tmp/"
 "function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Ștergere %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: Comanda „autoclean� nu are argumente\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Comanda „autoclean� nu are argumente"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Încă %sB eliberați pe disc\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Eliberați %sB din spațiul de pe disc\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Operațiune necorespunzătoare %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Argument șablon neașteptat după „keep-all�"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
-msgstr ""
-"Nu se pot rezolva dependențele, încercați să rulați cu --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
+msgstr "Nu se pot rezolva dependențele, încercați să rulați cu --full-resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Abandonează.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "descărcare: trebuie specificat cel puțin un pachet pentru descărcare\n"
+msgid "download: you must specify at least one package to download"
+msgstr "descărcare: trebuie specificat cel puțin un pachet pentru descărcare"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Nu s-a putut citi lista de surse"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Nu s-a găsit pachetul numit „%s�"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1023,22 +990,14 @@ msgid "[Working]"
 msgstr "[ÃŽn lucru]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: este necesar cel puțin un argument (directorul în\n"
-" care să se scrie fișierele).\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Nu există pachetul „%s�"
+"extract-cache-entries: este necesar cel puțin un argument (directorul în "
+"care să se scrie fișierele)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
@@ -1046,11 +1005,10 @@ msgstr ""
 "făcut.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: Comanda „forget-new� nu are argumente\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Comanda „forget-new� nu are argumente"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Ați vrea să uit ce pachetele sunt noi\n"
@@ -1158,18 +1116,18 @@ msgstr "Următoarele pachete vor fi înnoite:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Următoarele pachete instalate parțial vor fi configurate:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Următoarele pachete ESENȚIALE vor fi ȘTERSE!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "Următoarele pachete ESENȚIALE se vor DETERIORA în urma aceastei acțiuni:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1179,16 +1137,16 @@ msgstr ""
 "sistemului!\n"
 "           NU continuați decât dacă știți EXACT ce aveți de gând să faceți!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Sunt conștient că asta este o idee proastă"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Pentru a continua, tastați fraza „%s�:\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1207,7 +1165,7 @@ msgstr ""
 "astfel.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1218,7 +1176,7 @@ msgstr ""
 "                  %s::CmdLine::Ignore-Trust-Violations este "
 "'true' (adevărat)!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1231,7 +1189,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1240,100 +1198,100 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Vreți să ignorați acest avertisment și să continuați oricum?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr ""
 "Pentru a continua, introduceți „%s�; pentru a renunța, introduceți „%s�: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Intrare nerecunoscută.  Introduceți fie „%s� fie „%s�.\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Următoarele pachete sunt RECOMANDATE dar NU vor fi instalate:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Următoarele pachete sunt SUGERATE dar NU vor fi instalate:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Nici un pachet nu va fi instalat, înnoit sau șters.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu pachete înnoite, %lu nou instalate, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu reinstalate, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu retrogradate, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu de șters și %lu neînnoite.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Este nevoie de %sB/%sB de arhive. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Este nevoie de %sB de arhive. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "După despachetare %sB vor fi folosiți.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "După despachetare %sB vor fi eliberați.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Nici un pachet de arătat -- introduceți numele pachetului pe o linie după "
 "'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Apăsați Enter pentru a continua."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Nici un pachet găsit -- introduceți numele pachetului pe o linie după 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1343,30 +1301,30 @@ msgstr ""
 "pentru căutare, urmate de pachetul de justificat.\n"
 
 # XXX: is 'y' translatable?
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "continuă cu instalarea"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "renunță și ieși"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1374,12 +1332,12 @@ msgstr ""
 "arată informații despre unul sau mai multe pachete; după „i� ar trebui să "
 "urmeze numele pachetelor"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1387,39 +1345,39 @@ msgstr ""
 "arată jurnalul de modificări Debian ale unuia sau mai multor pachete; după "
 "„c� ar trebui să urmeze numele pachetelor"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "comută afișajul informațiilor de dependențe"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "comută afișajul modificărilor de dimensiune ale pachetelor"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "comută afișajul numerelor de versiune"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1427,27 +1385,27 @@ msgstr ""
 "încearcă găsirea unui motiv pentru instalarea unui pachet sau explică de ce "
 "instalarea unui pachet duce la instalarea unui alt pachet."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "rulează rezolvatorul automat de dependențe pentru a repara dependențele "
 "deteriorate."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "intră în interfața complet vizuală"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1459,49 +1417,49 @@ msgstr ""
 "de pachete (sau căi).  Acțiunea va fi aplicată tuturor pachetelor pe care le-"
 "ați listat.  Sunt disponibile următoarele acțiuni:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' pentru a instala pachete"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M' pentru a instala pachetele și a le marca imediat ca fiind instalate "
 "automat"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' pentru a șterge pachete"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' pentru a curăța pachete"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' pentru a păstra pachete"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 "':' pentru a ține pachetele în starea lor curentă fără a le marca pentru "
 "păstrare"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' pentru a marca pachetele ca fiind automat instalate"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m'pentru a marca pachetele ca fiind instalate manual"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "'&BD' pentru instalarea dependențelor de compilare ale unui pachet."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1509,29 +1467,29 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' pentru a marca pachetele ca fiind automat instalate"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Comenzi:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1539,21 +1497,21 @@ msgstr ""
 "aptitude nu a reușit să găsească o soluție pentru aceste dependențe. Puteți "
 "să le rezolvați dumneavoastră manual sau puteți scrie „n� pentru ieșire."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Vreți să continuați? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Se rezolvă manual aceste dependențe? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Răspunsul nu este valid. Introduceți o comandă validă sau „?� pentru "
 "ajutor.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1562,7 +1520,7 @@ msgstr ""
 "a instala un pachet), „R� pentru a încerca rezolvarea automată a "
 "dependențelor, sau „N� pentru a abandona."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1573,7 +1531,7 @@ msgstr ""
 "Se vor afișa informațiile despre dependențe.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1584,7 +1542,7 @@ msgstr ""
 "Nu se vor afișa informațiile despre dependențe.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1595,7 +1553,7 @@ msgstr ""
 "Se vor afișa versiunile.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1606,7 +1564,7 @@ msgstr ""
 "Nu se vor afișa versiunile.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1617,7 +1575,7 @@ msgstr ""
 "Se vor afișa schimbările de dimensiune.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1751,6 +1709,11 @@ msgstr "După „%c� se așteaptă cel puțin o pereche pachet/versiune."
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "După „%s� se așteapta o versiune sau „%s�"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Nu există pachetul „%s�"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1904,7 +1867,7 @@ msgstr ""
 "Aptitude „vrea� să rezolve dependențele, dar nu s-a creat nici un rezolvator "
 "de dependențe."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1934,7 +1897,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Următoarele comenzi sunt disponibile:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Fișierul de scris starea resolver: "
 
@@ -1968,7 +1931,7 @@ msgstr ""
 "           Puteți continua căutarea, însă unele soluții nu vor fi\n"
 "           găsite."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1977,27 +1940,26 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Nu se pot rezolva dependențele pentru actualizare (nu a fost găsită nici o "
 "soluție)."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Nu se pot rezolva dependențele pentru înnoire (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "eșuare iconv a lui %s.\n"
+msgid "iconv of %s failed"
+msgstr "eșuare iconv a lui %s"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "căutare: Trebuie să furnizați cel puțin un termen de căutare\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "căutare: Trebuie să furnizați cel puțin un termen de căutare"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2040,7 +2002,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Următoarele pachete nu au dependențele îndeplinite:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2263,7 +2225,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Furnizează"
 
@@ -2277,15 +2239,9 @@ msgstr "Descriere: "
 msgid "Homepage: "
 msgstr "Pagina de internet: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nu s-a putut localiza pachetul %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Nu se poate analiza modelul %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Nu s-au găsit pachete"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2296,14 +2252,13 @@ msgstr "Se dorește descărcarea/instalarea/ștergerea pachetelor.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Eroare internă, cerința n-a fost îndeplinită"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Se șterg fișierele învechite descărcate"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: Comanda „update� nu are argumente\n"
+msgid "The update command takes no arguments"
+msgstr "Comanda „update� nu are argumente"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2321,42 +2276,36 @@ msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 "%s: prea puține argumente; se aștepta cel puțin o etichetă și un pachet.\n"
 
-#: src/cmdline/cmdline_util.cc:167
-#, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Nu s-a gasit nici o versiune candidat pentru %s\n"
-
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Nu s-a gasit nici o versiune candidat sau curentă pentru %s\n"
+msgid "No candidate version found for %s"
+msgstr "Nu s-a gasit nici o versiune candidat pentru %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Nu s-a putut găsi o arhivă „%s� pentru pachetul „%s�\n"
+msgid "No current or candidate version found for %s"
+msgstr "Nu s-a gasit nici o versiune candidat sau curentă pentru %s"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Nu s-a putut găsi o versiune „%s� pentru pachetul „%s�\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Nu s-a putut găsi o arhivă „%s� pentru pachetul „%s�"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Eroare internă: valoare nevalidă %i dată la cmdline_find_ver!\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Nu s-a putut găsi o versiune „%s� pentru pachetul „%s�"
 
-#: src/cmdline/cmdline_util.cc:239
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Nu puteți alege concomitent o arhivă și o versiune pentru un pachet\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Eroare internă: valoare nevalidă %i dată la cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nu s-a putut găsi un jurnal de modificări pentru %s"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Nu puteți alege concomitent o arhivă și o versiune pentru un pachet"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
@@ -2364,7 +2313,7 @@ msgstr[0] "%d deteriorat [%+d]"
 msgstr[1] "%d deteriorate [%+d]"
 msgstr[2] "%d de deteriorate [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
@@ -2372,7 +2321,7 @@ msgstr[0] "%d înnoire [%+d]"
 msgstr[1] "%d înnoiri [%+d]"
 msgstr[2] "%d de înnoiri [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
@@ -2380,12 +2329,12 @@ msgstr[0] "%d nou [%+d]"
 msgstr[1] "%d noi [%+d]"
 msgstr[2] "%d noi [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Starea curentă: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
@@ -2393,7 +2342,7 @@ msgstr[0] "Există %d nou pachet învechit."
 msgstr[1] "Există %d noi pachete învechite."
 msgstr[2] "Există %d de noi pachete învechite."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
@@ -2401,57 +2350,85 @@ msgstr[0] "Există %d nou pachet învechit: "
 msgstr[1] "Există %d noi pachete învechite: "
 msgstr[2] "Există %d de noi pachete învechite: "
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Nici o virgulă după numele de etichetă „%s�"
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nu s-a putut localiza pachetul %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Nu s-a putut găsi un jurnal de modificări pentru %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Notă: alegerea sarcinii \"%s: %s\" pentru instalare\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Nu s-a putut găsi un jurnal de modificări pentru %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Pachete"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Pachetul sursă: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "Arhivă"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "căutare: Trebuie să furnizați cel puțin un termen de căutare\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2474,7 +2451,7 @@ msgstr "Curentă"
 msgid "Candidate"
 msgstr "Candidată"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Instalare"
 
@@ -2577,23 +2554,21 @@ msgstr "Nu se poate găsi o un motiv pentru instalarea lui %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Pachete ce depind de %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Nu există nici un pachetul numit „%s�."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Nu s-au putut analiza unele modele de căutare."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 "%s: această comandă are nevoie cel puțin de un argument (pachetul de "
-"interogat).\n"
+"interogat)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2619,11 +2594,11 @@ msgstr "NESATISFÄ‚CUT"
 msgid "UNAVAILABLE"
 msgstr "INDISPONIBIL"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Etichete"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Etichete de utilizator"
 
@@ -2833,32 +2808,32 @@ msgstr ""
 "altă unealtă apt instalează pachete. Se deschide în mod „doar-citire�, orice "
 "modificări pe care le faceți stării pachetelor NU vor fi păstrate!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 msgid "allowed"
 msgstr "permite_alegeri"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "principal"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2925,36 +2900,44 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "Cache-ul de pachete nu este disponibil; nu se pot descărca și instala "
 "pachetele."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Eroare internă: nu s-a putut genera lista pachetelor de descărcat"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Eșec la preluarea lui %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Nu s-au putut aduce unele arhive, poate ar fi o idee bună să rulați "
+"'aptitude update' sau încercați cu --fix-missing?"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Nu se poate realiza corecția pentru pachetele indisponibile"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Instalarea unui pachet a eșuat. Se încearcă revenirea:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3106,13 +3089,13 @@ msgstr ""
 "\n"
 "Înregistrare completă.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "Se descarcă pachetele"
@@ -3226,18 +3209,18 @@ msgstr ""
 "Fișierul de indecși ai pachetelor este deteriorat. Nu există câmpul 'Nume "
 "fișier' pentru pachetul %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Jurnal de modificări al lui %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "URL de folosit la descărcarea jurnalelor de modificări"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL de folosit la descărcarea jurnalelor de modificări"
@@ -3288,26 +3271,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nu se poate analiza modelul %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Se construiește baza de date cu etichete"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "Neinstalat"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "Neinstalat"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3456,42 +3440,42 @@ msgstr ""
 msgid "_File"
 msgstr "Fals"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Execută toate instalările și ștergerile nerezolvate"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Verifică existența a noi versiuni de pachete"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Marchează toate pachetele ce ar putea fi înnoite care nu sunt ținute la "
 "înnoire"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Uită de pachetele care sunt \"noi\""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Anulează toate instalările, ștergerile, păstrările și înoirile în curs."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Șterge fișierele pachetelor care-au fost anterior descărcate"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Șterge fișierele pachetelor ce nu mai pot fi descărcate"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Reîncărcare a cache-ului de pachete"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3501,7 +3485,7 @@ msgstr ""
 "Execută 'su' pentru a deveni root; asta va reporni programul, dar setările "
 "dumneavoastră vor fi păstrate"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Ieșire din program"
 
@@ -3509,7 +3493,7 @@ msgstr "Ieșire din program"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Renunță la ultima operațiune de pachet sau grup de operațiuni"
 
@@ -3543,7 +3527,7 @@ msgid "_Help"
 msgstr "Ajutor"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3552,19 +3536,19 @@ msgstr ""
 msgid "Update"
 msgstr "Actualizează Listă"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Pachete"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Previzualizare"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Rezolvator"
 
@@ -3751,7 +3735,7 @@ msgid "Fix Manually"
 msgstr "Manual"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "ÃŽnnoire"
 
@@ -4291,11 +4275,11 @@ msgstr "Instalat"
 msgid "Reinstall"
 msgstr "Reinstalare"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Retrogradare"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Ștergere"
 
@@ -4331,7 +4315,7 @@ msgstr "Aplică un filtru listei de pachete"
 msgid "Download already running."
 msgstr "Se descarcă... "
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Deja are loc o actualizare de listă de pachete sau o instalare."
 
@@ -4392,26 +4376,26 @@ msgstr "Nici un pachet deteriorat."
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Nu se poate înlocui %s cu noul fișier de configurare"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Se descarcă pachetele"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "Nici un pachet deteriorat."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "Nici un pachet deteriorat."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "Rezolvă Dependențe"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
@@ -4419,12 +4403,12 @@ msgstr[0] "Nici un pachet nu este deteriorat."
 msgstr[1] "Nici un pachet nu este deteriorat."
 msgstr[2] "Nici un pachet nu este deteriorat."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s schimbări"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s schimbări"
@@ -4432,7 +4416,7 @@ msgstr "%s schimbări"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4443,7 +4427,7 @@ msgstr[2] "%d instalare"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
@@ -4451,57 +4435,57 @@ msgstr[0] "eșec la ștergerea lui %s"
 msgstr[1] "eșec la ștergerea lui %s"
 msgstr[2] "eșec la ștergerea lui %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "DimensDesc"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "neinstalat"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "Instalat"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "^Curăță"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Èšine"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Păstrare"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "Manual de Utilizare"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4541,7 +4525,7 @@ msgstr "nu"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4586,17 +4570,17 @@ msgstr "%s; va fi instalată automat"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "Căutare"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "Se construiește vizualizarea"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Se construiește vizualizarea"
@@ -5310,110 +5294,111 @@ msgstr "Tip de aliniament necunoscut „%s�"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Politicile de sortare 'după nume' nu au argumente"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Nume nevalid la politica de sortare 'lungime zero'"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "'(' fără pereche în descrierea politicii de sortare"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Tip de politică de sortare incorect „%s�"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Nu se poate decoda șirul multioctet după \"%ls\""
 
 # XXX: știu că se referă la tipul de date wchar, dar nu am nici o idee mai bună
 # orice sugestie e binevenită
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Nu se poate decoda șirul caractere extinse după „%s�"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compilat la %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compilator: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Compilat cu:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt, versiunea %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  NCurses, versiunea: necunoscută\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  NCurses, versiunea: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++, versiunea: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Suportul pentru ept este activat.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Suportul pentru ept este dezactivat.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt, versiunea %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt, versiunea %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Suportul pentru ept este dezactivat.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s compilat la %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Suportul pentru ept este dezactivat.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5421,32 +5406,32 @@ msgstr ""
 "\n"
 "Versiunile curente ale bibliotecilor:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  NCurses, versiunea: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  cwidget, versiunea: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Apt, versiunea: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Utilizare: aptitude [-S fnume] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "        aptitude [opțiuni] <acțiune> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5456,42 +5441,42 @@ msgstr ""
 "interactiv):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Instalează/înnoiește pachetele.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Șterge pachetele.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Curăță pachetele și fișierele lor de configurare.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Pune pachetele în starea „păstrează�.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Anulează comanda de păstrare pentru un pachet.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Marchează pachetele ca fiind automat instalate.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Marchează pachetele ca fiind instalate manual.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5500,17 +5485,17 @@ msgstr ""
 " forbid-version - Interzice lui aptitude să înnoiască către o anumită "
 "versiune de pachet.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Descarcă listele de pachete noi/posibil de înnoit.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Execută o înnoire sigură.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5518,52 +5503,52 @@ msgid ""
 msgstr ""
 " full-upgrade - Execută o înnoire, posibil instalând și ștergând pachete.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' pentru instalarea dependențelor de compilare ale unui pachet."
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Uită de pachetele ce sunt \"noi\".\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Caută un pachet după nume și/sau expresie.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Afișează informații detaliate despre un pachet.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Afișează informații detaliate despre un pachet\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Șterge fișierele pachetelor descărcate.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Șterge vechile fișiere ale pachetelor descărcate.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Afișează jurnalul de modificări al unui pachet.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Descarcă fișierul .deb pentru un pachet.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5573,7 +5558,7 @@ msgstr ""
 "instalat\n"
 "                curent.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5583,7 +5568,7 @@ msgstr ""
 " why          - Arată pachetele instalate manual care „cer� un pachet, sau\n"
 "                de ce unul sau mai multe pachete ar „cere� pachetul dat.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5595,56 +5580,56 @@ msgstr ""
 "                cu pachetul dat, sau de ce unul sau mai multe pachete ar\n"
 "                duce la un conflict cu pachetul dat dacă este instalat.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Opțiuni:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Acest text de ajutor.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Acest text de ajutor\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simulează acțiunea, dar n-o executa în realitate.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Doar descarcă pachetele, nu instala sau șterge nimic.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Întodeauna cere confirmare pentru acțiuni.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5652,7 +5637,7 @@ msgstr ""
 " -y             Presupune că răspunsul la întrebările simple da/nu este "
 "'da'.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5661,7 +5646,7 @@ msgstr ""
 " -F format      Specifică un format pentru afișarea rezultatelor căutării;\n"
 "                vezi manualul.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5671,7 +5656,7 @@ msgstr ""
 "sortate;\n"
 "                vezi manual.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
@@ -5679,29 +5664,29 @@ msgstr ""
 " -w lățime      Specifică lățimea afișării pentru formatarea rezultatului\n"
 "                de căutare.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Încerc în mod agresiv să repar pachetele deteriorate.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Arată ce versiuni de pachete sunt instalate.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             Arată dependențele pachetelor schimbate automat.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z\t\tArată modificarea în dimensiune a fiecărui pachet instalat.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5710,14 +5695,14 @@ msgstr ""
 " -v             Afișează informații suplimentare (poate fi folosită de mai\n"
 "                multe ori).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 " -t [producție] Impune producția din care pachetele ar trebui instalate.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5726,13 +5711,13 @@ msgstr ""
 " -q             În modul linie de comandă, inhibă indicatoarele de progres\n"
 "                incrementale.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o key=val     Ajustează direct opțiunea de configurare numită 'key'.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5742,161 +5727,141 @@ msgstr ""
 "dependențe\n"
 "                puternice sau nu.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fnume       Citește informațiile de stare extinsă aptitude din fișierul "
 "fnume.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Descarcă listele cu pachetele noi la pornire.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             Acest text de ajutor\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Execută comanda de instalare la pornire\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                   Acest aptitude nu are puterile unei Super Vaci.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 msgid "trace"
 msgstr "adevărat"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 msgid "info"
 msgstr "nu"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 msgid "error"
 msgstr "Er "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "fals"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Operațiune necorespunzătoare %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Se așteaptă un număr după -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Așteptat un număr după -q=, primit %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o necesită un argument de forma cheie=valoare, s-a primit %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Nici o virgulă după numele de etichetă „%s�.\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "CIUDĂȚENIE: primit cod opțiune necunoscut\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "Pachet"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "Toate pachetele"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5904,37 +5869,32 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Doar unul din -u și -i poate fi specificat\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u și -i nu pot fi folosiți în modul „linie de comandă� (ex., cu „install�)"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u și -i nu pot fi folosiți cu o comandă"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Comandă necunoscută „%s�\n"
+msgid "Unknown command \"%s\""
+msgstr "Comandă necunoscută „%s�"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Excepție nedetectată: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5952,7 +5912,7 @@ msgstr "Căutare pentru: "
 msgid "Search backwards for: "
 msgstr "Căutare înapoi pentru: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Detector de mine"
 
@@ -6164,7 +6124,7 @@ msgstr "Codarea lui mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 16 30 17 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Pachet"
 
@@ -6245,8 +6205,8 @@ msgstr "<N/A>"
 msgid "<none>"
 msgstr "<niciuna>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtual"
@@ -6380,7 +6340,7 @@ msgstr "Nu se poate transcoda formatul afișării pachetului după „%ls�"
 msgid "Internal error: Default column string is unparsable"
 msgstr "Eroare internă: Șirul implicit de coloană este neanalizabil"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Sarcini"
 
@@ -6537,11 +6497,11 @@ msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 "Indexul de potrivire %ls este prea mare; grupurile disponibile sunt (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "PACHETE FÄ‚RÄ‚ ETICHETE"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6552,10 +6512,6 @@ msgstr ""
 "debtags nu este prezentă (instalarea lui debtags ar putea corecta această "
 "problemă)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "ETICHETÄ‚ LIPSÄ‚"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Pachetul sursă: "
@@ -7180,7 +7136,7 @@ msgstr "Se încarcă cache-ul"
 msgid "Really quit Aptitude?"
 msgstr "Chiar părăsiți Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Schimbă comportamentul lui aptitude"
 
@@ -7265,7 +7221,7 @@ msgstr ""
 msgid "License"
 msgstr "Licență"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 "Afișează condițiile și termenii în care puteți copia și distribui aptitude"
@@ -7287,7 +7243,7 @@ msgstr "Ajutor imediat"
 msgid "View a brief introduction to aptitude"
 msgstr "O introducere scurtă despre aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Ajutor"
 
@@ -7320,7 +7276,7 @@ msgstr "Manual"
 msgid "FAQ"
 msgstr "Întrebări frecvente"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Afișează o listă de întrebări frecvente"
 
@@ -7367,15 +7323,15 @@ msgstr ""
 "%nVreți să ștergeți acest director și tot conținutul său?  Dacă alegeți \"Nu"
 "\", nu veți mai vedea acest mesaj."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Vizualizarea progresului descărcării pachetelor"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Descărcare Pachet"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7387,35 +7343,35 @@ msgstr ""
 "sistemului dumneavoastră%b.  Ar trebui să continuați cu instalarea numai "
 "dacă sigur așa vreți să faceți.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [versiune %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Continuă întradevăr"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Renunță la instalare"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Previzualizare a instalării de pachete"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Afișează și/sau ajustează acțiunile ce vor fi executate"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Unele pachete au fost deteriorate și au fost reparate:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Nu există nici o soluție la aceste probleme de dependențe!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7424,7 +7380,7 @@ msgstr ""
 "A expirat timpul la încercarea de a rezolva dependențele (apăsați „%s� "
 "pentru a încerca mai mult)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7432,19 +7388,19 @@ msgstr ""
 "Instalarea/ștergerea pachetelor necesită privilegii administrative, care "
 "acum nu le aveți. Vreți să schimbați către contul de root?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Devin root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Nu devin root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Nici un pachet nu este programat sa fie instalat, șters sau înnoit."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7453,19 +7409,19 @@ msgstr ""
 "Nici un pachet nu va fi instalat, șters sau înnoit.  Unele pachete ar putea "
 "fi înnoite, dar n-ați ales asta.  Apăsați \"U\" pentru a pregăti o înnoire."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Se actualizează listele de pachete"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Afișează progresul actualizării listelor de pachete"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Actualizează Listă"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7473,23 +7429,23 @@ msgstr ""
 "Actualizarea listelor de pachete necesită privilegii administrative, pe care "
 "acum nu le aveți.  Vreți să schimbați către contul de root?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Pierdeți timpul încercând să găsiți mine"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Curățarea în timp ce descărcarea este în desfășurare nu este permisă"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Se șterg fișierele descărcate"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Fișierele pachetelor descărcate au fost șterse"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7498,12 +7454,12 @@ msgstr ""
 "Actualizarea listelor de pachete necesită privilegii administrative, pe care "
 "acum nu le aveți.  Vreți să schimbați către contul de root?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 "Fișierul cache apt nu este disponibil; nu se poate face auto-curățarea."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7512,7 +7468,7 @@ msgstr ""
 "Fișierele pachetelor învechite și descărcate au fost șterse, eliberându-se "
 "%sB din spațiul pe disc."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7521,122 +7477,122 @@ msgstr ""
 "Actualizarea listelor de pachete necesită privilegii administrative, pe care "
 "acum nu le aveți.  Vreți să schimbați către contul de root?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Nu mai sunt soluții."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Nu se poate găsi o soluție de aplicat."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "A expirat timpul în încercarea de a se găsi o soluție."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Rezolvă Dependențe"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Caută soluții pentru dependențele nesatisfăcute"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Nu se poate deschide %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Eroare în timpul scrierii stării rezolvatorului"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Instalează/șterge pachete"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Actualizează lista de pachete"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "^Marchează ce se poate înnoi"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "Uită de ^pachetele noi"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "A^nularea acțiunilor în desfășurare"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Curăță cache-ul de pachete"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Curăță ^fișierele învechite"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Reîncarcă cache-ul de pachete"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Joacă Detectorul de mine"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Autentificare ^root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "I^eșire"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Renunță"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Instalează"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Marchează pachetul selectat pentru instalare sau înnoire"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "Ș^terge"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Marchează pachetul selectat pentru ștergere"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Curăță"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Marchează pachetul selectat și fișierele sale de configurare pentru ștergere"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "Èšin^e"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Anulează orice acțiune pentru pachetul selectat"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Păstrează"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7644,11 +7600,11 @@ msgstr ""
 "Anulează orice acțiune pentru pachetul selectat, și protejează-l de înnoiri "
 "viitoare"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Marchează ^automat"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7656,11 +7612,11 @@ msgstr ""
 "Marchează pachetul selectat ca fiind instalat automat; va fi șters automat "
 "dacă nici un alt pachet nu depinde de el"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Marchează ^manual"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7668,11 +7624,11 @@ msgstr ""
 "Marchează pachetul selectat ca fiind instalat manual; nu va fi șters decât "
 "dacă îl veți șterge manual"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "Interzice ^versiunea"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7680,19 +7636,19 @@ msgstr ""
 "Interzice instalarea versiunii candidat pentru pachetul selectat; versiunile "
 "mai noi ale pachetului vor fi instalate ca de obicei"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformații"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Afișează mai multe informații despre pachetul selectat"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "C^omută informațiile despre pachet"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7702,94 +7658,94 @@ msgstr ""
 "pachetului, un sumar a stării dependențelor lui sau o analiză a motivului "
 "pentru care pachetul e cerut."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "Jurnal de modifi^cări"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Afișează jurnalul de modificări Debian pentru pachetul selectat"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Examinează soluția"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Examinarea soluției selectate pentru probleme de dependențe."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Aplică ^soluția"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Executarea acțiunilor conținute de soluția selectată."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "Soluția ^următoare"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Selectați următoarea soluție pentru problemele de dependențe."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "Soluția ^precedentă"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Selectați soluția precedentă pentru problemele de dependențe."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "P^rima soluție"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Selectați prima soluție pentru problemele de dependențe."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "U^ltima soluție"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr ""
 "Selectați ultima soluție pentru problemele de dependențe generate până acum."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Comută „acțiune ^respinsă�"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Comutare dacă acțiunea selectată este respinsă."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Comută „acțiune ^aprobată�"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Comutare dacă acțiunea selectată este aprobată."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Afișează ținta"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Afișează pachetul care va fi afectat de acțiunea selectată"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Refuză ^ignorarea păstrărilor"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7797,136 +7753,136 @@ msgstr ""
 "Refuză toate acțiunile care ar schimba starea pachetelor păstrate sau care "
 "ar instala versiuni interzise"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Caută"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Caută înainte"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "Ca^ută înapoi"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Căutare în direcție opusă"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "^Mai caută o dată"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Repetă ultima căutare"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Ca^ută din nou înapoi"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Repetă ultima căutare în direcția opusă"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Limitează afișajul"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Aplică un filtru listei de pachete"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Nu limita afișajul"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Șterge filtrul listei de pachete"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Caută ^deteriorat"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Caută următorul pachet cu dependențe nesatisfăcute"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Preferințe"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^Opțiuni interfață utilizator"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Schimbă parametrii care afectează interfața utilizatorului"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "Soluționarea ^dependențelor"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Schimbă parametrii care afectează modul în care sunt soluționate dependențele"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "Di^verse"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Schimbă diverși parametri ai programului"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Restaurează opțiunile"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Restaurează toți parametrii la valorile implicite ale sistemului"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Următorul"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Arată următorul afișaj"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Precedent"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Arată afișajul precedent"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "ÃŽ^nchide"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Închide acest afișaj"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "^Vizualizare nouă de pachete"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Crearea unei noi vizualizări implicite de pachete"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "^Revizuiește recomandările"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7934,88 +7890,88 @@ msgstr ""
 "Vizualizați pachetele recomandate pentru instalare, dar care nu sunt "
 "instalate."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "^Listă nouă simplă de pachete"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 "Vizualizați toate pachetele din sistem într-o singură listă, necategorisită"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Navigator nou de ^etichete deb"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Navighează pachetele utilizând datele etichetelor deb"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Navigator nou de ^categorii"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Navighează pachetele după categorie"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Despre"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Afișează informații despre acest program"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Ajutor"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Afișează ajutorul integrat"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Manualul utilizatorului"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Afișează manualul detaliat al programului"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "Întrebări ^frecvente"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Noutăți"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Afișează schimbările importante făcute în fiecare versiune a lui "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licență"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Acțiuni"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Căutare"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Opțiuni"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Vizualizări"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -8024,11 +7980,11 @@ msgstr ""
 "%ls: Meniu  %ls: Ajutor  %ls: Ieșire  %ls: Actualizare  %ls: Desc/Inst/"
 "Ștergere pachete"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "da_key"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "nu_key"
 
@@ -8056,10 +8012,52 @@ msgstr "URL de folosit la descărcarea jurnalelor de modificări"
 msgid "Downloading the changelog of %s"
 msgstr "Se descarcă jurnalul de modificări"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr ""
-"Puteți să vedeți doar jurnalele de modificări ale pachetelor Debian oficiale."
+#~ msgid "MISSING TAG"
+#~ msgstr "ETICHETÄ‚ LIPSÄ‚"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL de folosit la descărcarea jurnalelor de modificări"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Această opțiune controlează șablonul utilizat atunci când se descarcă "
+#~ "jurnalele de modificări de pe situl Debian. Va trebui să schimbați "
+#~ "aceasta doar dacă jurnalele se mută la o altă adresă."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s nu este un pachet Debian oficial, nu se poate afișa jurnalul său de "
+#~ "modificări."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Nu s-a găsit pachetul numit „%s�"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Nu se poate analiza modelul %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Se așteaptă un număr după -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Așteptat un număr după -q=, primit %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o necesită un argument de forma cheie=valoare, s-a primit %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "CIUDĂȚENIE: primit cod opțiune necunoscut\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u și -i nu pot fi folosiți cu o comandă"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr ""
+#~ "Puteți să vedeți doar jurnalele de modificări ale pachetelor Debian "
+#~ "oficiale."
 
 #~ msgid "Err "
 #~ msgstr "Er "
@@ -8236,11 +8234,6 @@ msgstr ""
 #~ msgstr "Se descarcă jurnalul de modificări"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Nici o rezoluție găsită."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Nu se poate deschide fișierul de ierarhii al pachetelor %s"
diff --git a/po/ru.gmo b/po/ru.gmo
index e8e4f9bd..74d86769 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 02a7d0a5..a42976ad 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude 0.6.5-1+\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:29+0800\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -369,24 +369,10 @@ msgstr ""
 "загружены из любого архива, указанного в sources.list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL дл� �качивани� �пи�ков изменений"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Эта на�тройка контролирует шаблон, который и�пользует�� дл� �качивани� "
-"�пи�ка изменений � веб-�айта Debian. Её нужно мен�ть только, е�ли изменил�� "
-"URL �пи�ка изменений."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Показать, что будет �делано, перед тем как делать"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -394,12 +380,12 @@ msgstr ""
 "Е�ли �та на�тройка включена, то перед тем как aptitude попро�ит подтвердить "
 "у�тановку пакета, будет показан �пи�ок дей�твий, которые будут выполнены."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Забывать о «новых» пакетах по�ле обновлени� �пи�ка пакетов"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -407,12 +393,12 @@ msgstr ""
 "Е�ли �та на�тройка включена, то aptitude очи�тит �пи�ок новых пакетов по�ле "
 "обновлени� �пи�ка пакетов (например, по нажатию «u»)."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Забывать о «новых» пакетах по�ле у�тановки или удалении пакетов"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -422,13 +408,13 @@ msgstr ""
 "того как вы выполните запу�к у�тановки или у�тановку или удаление пакетов из "
 "командной �троки."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "�е показывать предупреждение при первом изменении в режиме только дл� чтени�"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -438,12 +424,12 @@ msgstr ""
 "когда вы измен�ете �о�то�ние пакета, е�ли вы не имеете прав делать изменени� "
 "в �и�теме."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Предупреждать о попытке выполнить дей�твие при от�ут�твии необходимых прав"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -456,11 +442,11 @@ msgstr ""
 "будет предложена войти в �и�тему �уперпользователем и выполнить дей�твие � "
 "большими правами."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Файл, в который будет �охранён журнал"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -472,11 +458,11 @@ msgstr ""
 "%b»), то о�таток имени будет ра��матривать�� как команда оболочки командной "
 "�троки, котора� принимает данные о дей�тви�х aptitude �о �тандартного ввода."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "�втоматиче�ки разрешать зави�имо�ти выбираемого пакета"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -488,12 +474,12 @@ msgstr ""
 "намного бы�трее чем в�троенный решатель зави�имо�тей, но может приводить к "
 "не оптимальным результатам или вообще не �работать в некоторых �луча�х."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "�втоматиче�ки и�правл�ть �ломанные пакеты перед у�тановкой или удалением"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -505,11 +491,11 @@ msgstr ""
 "от решател�. Иначе aptitude предложит вам решение проблемы �ломанных "
 "зави�имо�тей."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "�втоматиче�ки у�танавливать рекомендуемые пакеты"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -526,11 +512,11 @@ msgstr ""
 "удал�ть неи�пользуемые пакеты» включены, то пакеты, рекомендуемые "
 "у�танавливаемым пакетом, не будут автоматиче�ки удалены."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "�втоматиче�ки удал�ть неи�пользуемые пакеты"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -547,11 +533,11 @@ msgstr ""
 "автоматиче�ки» включены, то автоматиче�ки у�тановленные пакеты не будут "
 "удал�ть��, е�ли какой-то из у�тановленных пакетов их рекомендует."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Пакеты, которые никогда не будут автоматиче�ки удалены"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -561,13 +547,13 @@ msgstr ""
 "как е�ли бы у�тановленные пакеты зави�ели от них: они никогда не будут "
 "помечать�� дл� удалени� как неи�пользуемые пакеты."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Позволить разрешение зави�имо�тей не обраща� внимание на фик�ации и "
 "запрещени�"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -590,15 +576,15 @@ msgstr ""
 "зави�имо�тей пакета, который был только что выбран дл� у�тановки или "
 "обновлени�."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "�а�тройки интерфей�а"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Работа � зави�имо�т�ми"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Разное"
 
@@ -707,7 +693,7 @@ msgstr "�е удало�ь найти пакет � и�ходниками дл
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "�е удало�ь удовлетворить зави�имо�ть из build-depends: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -716,7 +702,7 @@ msgstr ""
 "Замечание: «%s», предо�тавл�ющий виртуальный пакет\n"
 "           «%s», уже у�тановлен.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -725,7 +711,7 @@ msgstr ""
 "Замечание: «%s», предо�тавл�ющий виртуальный пакет\n"
 "           «%s», уже выбран дл� у�тановки.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -734,17 +720,22 @@ msgstr ""
 "«%s» �уще�твует в базе данных пакетов, но �то не\n"
 "на�то�щий пакет, и ни один пакет не предо�тавл�ет его.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "«%s» �вл�ет�� виртуальным пакетом, предо�тавленный:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Вы должны выбрать один дл� у�тановки.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Дл� пакета «%s» не найден кандидат на у�тановку"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -753,62 +744,55 @@ msgstr ""
 "Замечание: выбран «%s» вме�то\n"
 "           виртуального пакета «%s»\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s уже у�тановлен запрошенной вер�ии (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s не у�тановлен, по�тому не будет обновлён.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s уже у�тановлен �амой по�ледней вер�ии, по�тому не будет обновлён.\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s не у�тановлен, по�тому не может быть переу�тановлен.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Пакет %s не у�тановлен, по�тому не может быть удалён\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Пакет %s не у�тановлен, по�тому не может быть запрещён к обновлению\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Пакет %s не обновл�емый, по�тому нельз� запретить его обновление\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Замечание: выбрана задача «%s: %s» дл� у�тановки\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Вы можете указать вер�ию пакета только в команде «install» или «forbid-"
-"version».\n"
+"version»"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Вы можете указать архив пакета только в команде «install».\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Вы можете указать архив пакета только в команде «install»"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -817,7 +801,7 @@ msgstr ""
 "�е удало�ь найти пакет «%s», и более чем 40\n"
 "пакетов �одержат «%s» в �воём имени.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -826,12 +810,12 @@ msgstr ""
 "�е удало�ь найти пакет «%s». Однако, �ледующие\n"
 "пакеты �одержат «%s» в �воём имени:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "�е удало�ь найти пакеты, �одержащих «%s» в �воём имени или опи�ании\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -849,7 +833,7 @@ msgstr ""
 "�е удало�ь найти пакет имеющий «%s». Однако, �ледующие\n"
 "пакеты �одержат «%s» в �воём опи�ании.\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "�екорректный �имвол «%c» дл� выбора дей�тви�\n"
@@ -871,7 +855,7 @@ msgstr "Ошибка "
 msgid "Changelog download failed: %s"
 msgstr "�е удало�ь �качать Changelog: %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "�е удало�ь запу�тить �оответ�твующую программу про�мотра, �то работающий "
@@ -879,95 +863,79 @@ msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s не официальный пакет Debian, невозможно отобразить его �пи�ок изменений."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "�е удало�ь найти �пи�ок изменений дл� %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "�е удало�ь найти �пи�ок изменений дл� %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: Команде clean не нужны аргументы\n"
+msgid "The clean command takes no arguments"
+msgstr "Команде clean не нужны аргументы"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Удалить %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr "�е удало�ь обнаружить ваш домашний каталог!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Del %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: Команде autoclean не нужны аргументы\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Команде autoclean не нужны аргументы"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Будет о�вобождено %sБ ди�кового про�тран�тва\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "О�вобождено %sБ ди�кового про�тран�тва\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "�еверна� операци� %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "�еожидаемый шаблонный аргумент по�ле «keep-all»"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "�е удало�ь безопа�но разрешить зави�имо�ти, попробуйте запу�тить � "
-"параметром --full-resolver.\n"
+"параметром --full-resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Прервать.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "�качивание: вы должны указать хот� бы один пакет дл� �качивани�\n"
+msgid "download: you must specify at least one package to download"
+msgstr "�качивание: вы должны указать хот� бы один пакет дл� �качивани�"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "�е удало�ь прочитать файл sources.list"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "�е удало�ь найти пакет, � именем «%s»"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1005,33 +973,24 @@ msgid "[Working]"
 msgstr "[Обработка]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: требует�� хот� бы один параметр (каталог,\n"
-"в который пишут�� файлы).\n"
+"extract-cache-entries: требует�� хот� бы один параметр (каталог, в который "
+"пишут�� файлы)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Пакет «%s» не найден"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 "Заданным пои�ковым шаблоном не выбрано ни одного пакета; не � чем работать.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: Команде forget-new не нужны параметры\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Команде forget-new не нужны параметры"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Забыть, что пакеты новые\n"
@@ -1138,19 +1097,19 @@ msgstr "Следующие пакеты будут обновлены:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Следующие ча�тично у�тановленные пакеты будут на�троены:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Следующие пакеты ПЕРВОЙ �ЕОБХОДИМОСТИ будут УД�ЛЕ�Ы!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 "Следующие пакеты ПЕРВОЙ �ЕОБХОДИМОСТИ �танут �ЕР�БОТОСПОСОБ�Ы из-за �того "
 "дей�тви�:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1159,16 +1118,16 @@ msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: Выполнение �того дей�тви� веро�тно и�портит вашу �и�тему!\n"
 "         О�тановите�ь, е�ли ТОЧ�О не знаете, что делаете!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Я знаю, что �то очень плоха� иде�"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Чтобы продолжить, наберите фразу «%s»:\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1184,7 +1143,7 @@ msgstr ""
 "Продолжайте у�тановку, е�ли только вам точно �то нужно.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1194,7 +1153,7 @@ msgstr ""
 "                  %s::CmdLine::Ignore-Trust-Violations у�тановлено в "
 "«true»!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1207,7 +1166,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr "Продолжить и игнорировать предупреждение|Yes"
 
@@ -1216,98 +1175,98 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr "Прервать операцию из-за предупреждени�|No"
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Хотите игнорировать предупреждение и продолжить?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Чтобы продолжить, наберите фразу «%s»; дл� отмены введите «%s»: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "�еверный ввод. Требует�� «%s» или «%s».\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr ""
 "РЕКОМЕ�ДУЮТСЯ �ледующие пакеты, но автоматиче�ки они у�тановлены �Е БУДУТ:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 "ПРЕДЛ�Г�ЮТСЯ �ледующие пакеты, но автоматиче�ки они у�тановлены �Е БУДУТ:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "�и одного пакета не будет у�тановлено, обновлено или удалено.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu пакетов обновлено, %lu у�тановлено новых, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu переу�тановлено, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu пакетов заменены на �тарые вер�ии, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu пакетов отмечено дл� удалени�, и %lu пакетов не обновлено.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "�еобходимо получить %sB/%sB архивов. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "�еобходимо получить %sB архивов. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "По�ле ра�паковки %sB будет зан�то.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "По�ле ра�паковки о�вободит�� %s байт.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "�ет пакетов дл� показа — введите имена пакетов в �троке по�ле «i».\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "�ажмите Ввод дл� продолжени�."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Пакеты не найдены — введите имена пакетов в �троке по�ле «c».\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1316,30 +1275,30 @@ msgstr ""
 "Пакеты не найдены — введите ноль или более корней пои�ка по�ле пакета дл� "
 "подтверждени�.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "продолжить � у�тановкой"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "прервать и завершить работу"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1347,12 +1306,12 @@ msgstr ""
 "показать информацию об одном или более пакетов; названи� пакетов должны быть "
 "перечи�лены по�ле «i»"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1360,39 +1319,39 @@ msgstr ""
 "показать �пи�ок изменений Debian одного или более пакетов; названи� пакетов "
 "должны быть перечи�лены по�ле «c»"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "переключить�� на показ информации о зави�имо�т�х"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "переключить�� на показ изменений размеров пакетов"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "переключить�� на показ номеров вер�ий"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1400,27 +1359,27 @@ msgstr ""
 "попытать�� вы��нить причину у�тановки одного пакета или объ��нить почему "
 "у�тановка одного пакета должна приве�ти к у�тановке другого пакета."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "запу�тить автоматиче�кий решатель зави�имо�тей дл� и�правление �ломанных "
 "зави�имо�тей."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "войти в полнооконный визуальный интерфей�"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1432,46 +1391,46 @@ msgstr ""
 "шаблоны). Дей�твие будет выполнено ко в�ем пакетам �того �пи�ка. Возможные "
 "дей�тви�:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "«+» у�тановить пакеты"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "«+M» у�тановить пакеты и �разу пометить их как автоматиче�ки у�тановленные"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "«-» удалить пакеты"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "«_» вычи�тить пакеты"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "«=» зафик�ировать пакеты"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "«:» �охранить пакеты в их текущем �о�то�нии без фик�ации"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "«&M» пометить пакеты как автоматиче�ки у�тановленные"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "«&m» пометить пакеты как у�тановленные вручную"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "«&BD» у�тановить �борочные зави�имо�ти пакета."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1483,29 +1442,29 @@ msgstr ""
 "отображают дополнительную информацию о �о�то�нии пакета; они могут "
 "�о�тавл�ть любые комбинации:"
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 msgid "'a': the package was automatically installed or removed."
 msgstr "«a»: пакет был у�тановлен или удалён автоматиче�ки."
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 "«b»: некоторые зави�имо�ти пакета нарушают�� предлагаемыми изменени�ми."
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr "«p»: пакет будет вычищен в дополнение к обычному удалению."
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr "«u»: пакет будет удалён, так как больше не и�пользует��."
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Команды:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1513,19 +1472,19 @@ msgstr ""
 "aptitude не удало�ь найти решение дл� �тих зави�имо�тей. Вы можете разрешить "
 "�то вручную или нажмите «n», чтобы выйти."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Хотите продолжить? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Будете разбирать�� � зави�имо�т�ми вручную? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "�еверный ответ. Введите допу�тимую команду или «?» дл� �правки.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1534,7 +1493,7 @@ msgstr ""
 "у�тановки пакет), «R» — дл� автоматиче�кого разрешени� зави�имо�тей или «N» "
 "— чтобы прервать."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1545,7 +1504,7 @@ msgstr ""
 "Будет отображать�� информаци� о зави�имо�т�х.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1556,7 +1515,7 @@ msgstr ""
 "�е будет отображать�� информаци� о зави�имо�т�х.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1567,7 +1526,7 @@ msgstr ""
 "Будет отображать�� информаци� о вер�и�х.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1578,7 +1537,7 @@ msgstr ""
 "�е будет отображать�� информаци� о вер�и�х.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1589,7 +1548,7 @@ msgstr ""
 "Будет отображать�� информаци� об изменении размеров.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1726,6 +1685,11 @@ msgstr "Ожидает�� как минимум одна пара пакет/в
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Ожидает�� вер�и� или «%s» по�ле «%s»"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Пакет «%s» не найден"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1885,7 +1849,7 @@ msgstr ""
 "Можно было бы решить зави�имо�ти, но решатель проблем � зави�имо�т�ми не "
 "�оздан."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1915,7 +1879,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Возможны �ледующие команды:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Файл дл� запи�и �о�то�ни� решател� в: "
 
@@ -1948,7 +1912,7 @@ msgstr ""
 "*** ОШИБК�: пои�к прерван из-за неу�транимого и�ключени�. Вы можете\n"
 "           продолжить пои�к, но некоторые решени� будут невыполнимы."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1960,24 +1924,23 @@ msgstr ""
 "решател�. Вы можете попробовать решить �ту проблему увеличив значение\n"
 "Aptitude::ProblemResolver::StepLimit (�ейча� равно %d)."
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "�е удало�ь разрешить зави�имо�ти дл� обновлени�: решение не найдено."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "�е удало�ь разрешить зави�имо�ти дл� обновлени�: %s"
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "вызов iconv дл� %s завершил�� неудачно.\n"
+msgid "iconv of %s failed"
+msgstr "вызов iconv дл� %s завершил�� неудачно"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "пои�к: вы должны вве�ти хот� бы одно �лово\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "пои�к: вы должны вве�ти хот� бы одно �лово"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2020,7 +1983,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Следующие пакеты имеют неудовлетворённые зави�имо�ти:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2243,7 +2206,7 @@ msgid "Enhances"
 msgstr "Улучшают"
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Предо�тавл�ют"
 
@@ -2257,15 +2220,9 @@ msgstr "Опи�ание: "
 msgid "Homepage: "
 msgstr "Сайт: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "�е удало�ь найти пакет %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "�е удало�ь проанализировать шаблон %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "�е найдено ни одного пакета"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2276,13 +2233,14 @@ msgstr "Эти пакеты были бы загружены/уÑ�тановлеÐ
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Внутренн�� ошибка, упор�дочивание не закончено"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Удаление у�таревших загруженных файлов"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
+#, fuzzy
+#| msgid "E: The update command takes no arguments\n"
+msgid "The update command takes no arguments"
 msgstr "E: Команде update не нужны аргументы\n"
 
 #: src/cmdline/cmdline_user_tag.cc:65
@@ -2300,42 +2258,36 @@ msgstr "Удал�ет�� пользователь�ка� метка «%s» д
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr "%s: �лишком много параметров; ожидает�� только им� метки и пакета.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "�ет подход�щей вер�ии дл� %s\n"
+msgid "No candidate version found for %s"
+msgstr "�ет подход�щей вер�ии дл� %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "�ет в наличии или подход�щей вер�ии дл� %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "�ет в наличии или подход�щей вер�ии дл� %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "�е удаёт�� найти архив «%s» пакета «%s»\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "�е удаёт�� найти архив «%s» пакета «%s»"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "�е удаёт�� найти вер�ию «%s» пакета «%s»\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "�е удаёт�� найти вер�ию «%s» пакета «%s»"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Внутренн�� ошибка: неверное значение %i передано в cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Внутренн�� ошибка: неверное значение %i передано в cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Вы не можете указать архив и вер�ию пакета одновременно\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Вы не можете указать архив и вер�ию пакета одновременно"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "�е удало�ь найти �пи�ок изменений дл� %s"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
@@ -2343,7 +2295,7 @@ msgstr[0] "%d �ломан [%+d]"
 msgstr[1] "%d �ломано [%+d]"
 msgstr[2] "%d �ломано [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
@@ -2351,7 +2303,7 @@ msgstr[0] "%d обновлён [%+d]"
 msgstr[1] "%d обновлено [%+d]"
 msgstr[2] "%d обновлено [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
@@ -2359,12 +2311,12 @@ msgstr[0] "%d новый [%+d]"
 msgstr[1] "%d новых [%+d]"
 msgstr[2] "%d новых [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Текущее �о�то�ние: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
@@ -2372,7 +2324,7 @@ msgstr[0] "Е�ть %d теперь тоже у�таревший пакет."
 msgstr[1] "Е�ть %d теперь тоже у�таревших пакета."
 msgstr[2] "Е�ть %d теперь тоже у�таревших пакетов."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
@@ -2380,48 +2332,76 @@ msgstr[0] "Е�ть %d теперь тоже у�таревший пакет: "
 msgstr[1] "Е�ть %d теперь тоже у�таревших пакета: "
 msgstr[2] "Е�ть %d теперь тоже у�таревших пакетов: "
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "�е указана зап�та� по�ле имени метки «%s»"
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "�е удало�ь найти пакет %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "�е удало�ь найти �пи�ок изменений дл� %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Замечание: выбрана задача «%s: %s» дл� у�тановки\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "�е удало�ь найти �пи�ок изменений дл� %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, c-format
 msgid "Package %s:"
 msgstr "Пакет %s:"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, c-format
 msgid "Source package %s:"
 msgstr "И�ходный пакет %s:"
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, c-format
 msgid "Archive %s:"
 msgstr "�рхив %s:"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr "--group-by|archive"
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr "--group-by|auto"
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr "--group-by|none"
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr "--group-by|package"
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr "--group-by|source-package"
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr "--group-by|source-version"
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
@@ -2430,10 +2410,9 @@ msgstr ""
 "�екорректный режим группировки пакетов «%s» (должно быть «auto», «none», "
 "«package» или «source-package»)"
 
-#: src/cmdline/cmdline_versions.cc:584
-#, c-format
-msgid "versions: You must provide at least one package selector\n"
-msgstr "вер�ии: вы должны вве�ти хот� бы один параметр выбора пакетов\n"
+#: src/cmdline/cmdline_versions.cc:578
+msgid "versions: You must provide at least one package selector"
+msgstr "вер�ии: вы должны вве�ти хот� бы один параметр выбора пакетов"
 
 #: src/cmdline/cmdline_why.cc:290
 msgid "dep_level"
@@ -2455,7 +2434,7 @@ msgstr "Текуща�"
 msgid "Candidate"
 msgstr "Кандидат"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "У�тановить"
 
@@ -2558,22 +2537,20 @@ msgstr "�е удало�ь найти причину дл� у�тановки
 msgid "Packages requiring %s:"
 msgstr "Пакеты, требующие %s:"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Пакета � именем «%s» не �уще�твует."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "�е удало�ь проанализировать некоторые пои�ковые шаблоны."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
-"%s: дл� �той команды нужен как минимум один аргумент (запрашиваемый пакет).\n"
+"%s: дл� �той команды нужен как минимум один аргумент (запрашиваемый пакет)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2599,11 +2576,11 @@ msgstr "�ЕУДОВЛЕТВОРИТЕЛЬ�ЫЙ"
 msgid "UNAVAILABLE"
 msgstr "�ЕДОСТУП�ЫЙ"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Метки"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Пользов. метки"
 
@@ -2810,32 +2787,32 @@ msgstr ""
 "от утилита apt уже выполн�ет у�тановку пакета. Выполн�ет�� открытие в режиме "
 "только дл� чтени�; любые изменени� �о�то�ний пакетов �охранены �Е БУДУТ!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 msgid "allowed"
 msgstr "allow_choices"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "main"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2910,34 +2887,42 @@ msgstr ""
 "�еверный уровень безопа�но�ти «%s» (не «discard», «maximum», «minimum» или "
 "чи�ло)."
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr "�едо�тупен к�ш пакетов; не удало�ь �качать и у�тановить пакеты."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Внутренн�� ошибка: не удало�ь �оздать �пи�ок пакетов дл� �качивани�"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "�е удало�ь получить %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"�евозможно получить некоторые архивы, веро�тно надо запу�тить aptitude "
+"update или попытать�� повторить запу�к � ключом --fix-missing"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "�е удало�ь �корректировать недо�тупно�ть пакетов"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "�е удало�ь у�тановить пакет. Попытка во��тановить:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3089,13 +3074,13 @@ msgstr ""
 "\n"
 "Конец журнала.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr "Выполн�ет�� до�туп к индек�у"
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 msgid "Filtering packages"
 msgstr "Фильтруют�� пакеты"
 
@@ -3205,18 +3190,18 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Индек�ный файл пакетов повреждён. �ет пол� Filename: дл� пакета %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Changelog дл� %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "�е удало�ь �качать �пи�ок изменений: %s"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "�е удало�ь �качать �пи�ок изменений: неожиданное и�ключение."
 
@@ -3267,25 +3252,26 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "�е удало�ь преобразовать �троку на�тройки �тоимо�ти: %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "По�троение базы данных меток"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr "у�тарел"
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 msgid "No tag descriptions are available."
 msgstr "Метки опи�аний недо�тупны."
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, c-format
 msgid "No description available for %s."
 msgstr "�едо�тупно опи�ание дл� %s."
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr "у�тарел"
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3428,40 +3414,40 @@ msgstr "Пакетный менеджер Aptitude"
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Выполнить в�е незаконченные у�тановки и удалени�"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Проверить, е�ть ли новые вер�ии пакетов"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Пометить в�е обновл�емые пакеты, которые не зафик�ированы от обновлени�"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Забыть о «новых» пакетах"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "Отменить в�е незаконченные у�тановки, удалени�, фик�ации и обновлени�."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Удалить ранее загруженные файлы пакетов"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Удалить файлы пакетов, которые больше никогда не будут загружены"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Перезагрузить к�ш пакетов"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3471,7 +3457,7 @@ msgstr ""
 "Запу�к «su», чтобы �тать �уперпользователем. Это приведёт к перезапу�ку "
 "программы, но ваши на�тройки будут �охранены"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Завершить работу программы"
 
@@ -3479,7 +3465,7 @@ msgstr "Завершить работу программы"
 msgid "E_dit"
 msgstr "П_равка"
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Отменить по�леднюю операцию � пакетом или группу операций"
 
@@ -3510,7 +3496,7 @@ msgid "_Help"
 msgstr "­_Справка"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr "Инф. панель"
 
@@ -3518,19 +3504,19 @@ msgstr "Инф. панель"
 msgid "Update"
 msgstr "Обновить"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Пакеты"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Предпро�мотр"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Решатель"
 
@@ -3705,7 +3691,7 @@ msgid "Fix Manually"
 msgstr "И�править вручную"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Обновить"
 
@@ -4241,11 +4227,11 @@ msgstr "У�тановлен"
 msgid "Reinstall"
 msgstr "Переу�тановить"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Заменить на более �тарый"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Удалить"
 
@@ -4277,7 +4263,7 @@ msgstr "Вы должны иметь права �уперпользовател
 msgid "Download already running."
 msgstr "Скачивание уже запущено."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Запу�к обновлени� �пи�ка пакетов или у�тановка уже произведены."
 
@@ -4343,23 +4329,23 @@ msgstr "Ошибка в пакете %s"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Запро� на замену файла на�тройки %s"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Скачивают�� пакеты"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr "Сломанные пакеты"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr "Показать �ломанные пакеты"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr "Разрешить зави�имо�ти"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
@@ -4367,18 +4353,18 @@ msgstr[0] "%d пакет �ломан"
 msgstr[1] "%d пакета �ломано"
 msgstr[2] "%d пакетов �ломано"
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr "Про�мотр изменений"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr "У�тановка изменений"
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4389,7 +4375,7 @@ msgstr[2] "%d пакетов дл� у�тановки"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
@@ -4397,53 +4383,53 @@ msgstr[0] "%d пакет дл� удалени�"
 msgstr[1] "%d пакета дл� удалени�"
 msgstr[2] "%d пакетов дл� удалени�"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr "Скачиваемый объём: %sБ."
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr "Метки дл� %s:\n"
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr "Эта возможно�ть ещё не реализована."
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr "�е реализовано"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr "У�тановка/Обновление"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr "Вычи�тить"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "О�тавить"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Фик�ировать"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr "Пометить как у�тан. автоматиче�ки"
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr "Пометить как у�тан. вручную"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr "Переключить автоматиче�кое �о�то�ние"
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4479,7 +4465,7 @@ msgstr "Инфо"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4523,15 +4509,15 @@ msgstr "%s; у�танавливает�� вручную."
 msgid "Cache reloading, please wait..."
 msgstr "Выполн�ет�� перезагрузка к�ша, подождите…"
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr "Идёт пои�к…"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr "Окончательный вид"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Со�тавл�емый вид"
@@ -5246,109 +5232,110 @@ msgstr "�еизве�тный тип выравнивани� «%s»"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Сортирующим правилам By-name не нужно аргументов"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Пу�тое им� �ортирующего правила недопу�тимо"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "�ет пары дл� «(» в опи�ании �ортирующего правила"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "�екорректный тип �ортирующего правила «%s»"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "�е удало�ь декодировать многобайтовую �троку по�ле «%ls»"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 "�е удало�ь декодировать широкоформатную (wide-character) �троку по�ле «%s»"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s �компилировано в %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Компил�тор: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Скомпилировано � помощью:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt вер�ии %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  Вер�и� NCurses: �еизве�тна\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  Вер�и� NCurses %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  Вер�и� libsigc++: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Поддержка ept включена.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Поддержка ept выключена.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  Gtk+ вер�ии %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  Gtk-- вер�ии %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Поддержка Gtk+ выключена.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "  Скомпилировано � Qt %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr "  Работает на Qt %s\n"
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Поддержка Qt выключена.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5356,32 +5343,32 @@ msgstr ""
 "\n"
 "Текущие вер�ии библиотек:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  Вер�и� NCurses: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  Вер�и� cwidget: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Вер�и� Apt: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "И�пользование: aptitude [-S им� файла] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [параметры] <дей�твие> …"
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5390,42 +5377,42 @@ msgstr ""
 "  Дей�тви� (е�ли не задано, aptitude запу�кает�� в диалоговом режиме):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - У�тановить/обновить пакеты.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Удалить пакеты.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Удалить пакеты и их файлы на�тройки.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Зафик�ировать пакеты.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Отменить команду hold дл� пакета.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Пометить пакет, что он был у�тановлен автоматиче�ки.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Пометить пакет, что он был у�тановлен вручную.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5433,17 +5420,17 @@ msgid ""
 msgstr ""
 " forbid-version - Запретить aptitude обновл�ть определённую вер�ию пакета.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Скачать �пи�ок новых/обновлённых пакетов.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Выполнить безопа�ное обновление.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5452,52 +5439,52 @@ msgstr ""
 " full-upgrade - Выполнить обновление, возможна у�тановка и удаление "
 "пакетов.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr " build-dep    - У�тановить �борочные зави�имо�ти пакета.\n"
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Забыть, какие пакеты «новые».\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - �айти пакет по имени и/или выражению.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Показать подробную информацию о пакете.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " versions     - Показать вер�ии указанных пакетов.\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Удалить �качанные файлы пакетов.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Удалить �тарые �качанные файлы пакетов.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - По�мотреть �пи�ок изменений пакета.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Скачать файл .deb дл� пакета.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5506,7 +5493,7 @@ msgstr ""
 " reinstall    - Скачать и (возможно) переу�тановить уже у�тановленный "
 "пакет.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5517,7 +5504,7 @@ msgstr ""
 "                или почему одному или более пакетам потребовал�� бы\n"
 "                заданный пакет.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5530,47 +5517,47 @@ msgstr ""
 "                пакетов привели бы к конфликту � заданным пакетом,\n"
 "                е�ли бы он был у�тановлен.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Параметры:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Эта �правка.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 " --gui          И�пользовать ГИП GTK, даже е�ли он выключен в на�тройках.\n"
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr " --no-gui       �е и�пользовать ГИП GTK, даже е�ли �то возможно.\n"
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " --qt           И�пользовать ГИП Qt.\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 " --no-qt        �е и�пользовать ГИП Qt даже е�ли он включён в на�тройке.\n"
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 " -s             Имитировать дей�тви�, но не выполн�ть их на �амом деле.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -5578,18 +5565,18 @@ msgstr ""
 " -d             Только �качать пакеты, ничего не у�танавливать и не "
 "удал�ть.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             В�егда �прашивать подтверждение или дей�тви�.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             Предполагать ответ «да» на про�той вопро� да/нет.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5598,7 +5585,7 @@ msgstr ""
 " -F format      Задать формат отображени� результатов пои�ка; �мотрите "
 "руковод�тво.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5607,36 +5594,36 @@ msgstr ""
 " -O order       Задать формат �ортировки результатов пои�ка; �мотрите "
 "руковод�тво.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w width       Задать ширину вывода результатов пои�ка.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Принудительно и�правл�ть неработо�по�обные пакеты.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Показывать вер�ию у�танавливаемых пакетов.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             Показывать зави�имо�ти автоматиче�ки измен�емых пакетов.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 " -Z             Показывать изменение размера у�тановки каждого пакета.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5645,14 +5632,14 @@ msgstr ""
 " -v             Отображать дополнительную информацию. (может указывать�� "
 "не�колько раз).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 " -t [release]   Задать выпу�к, из которого должны быть у�тановлены пакеты.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5661,14 +5648,14 @@ msgstr ""
 " -q             �е выводить индикаторы хода работы в режиме командной "
 "�троки.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o key=val     Вручную у�тановить значение параметра на�тройки � именем "
 "«key».\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5677,77 +5664,77 @@ msgstr ""
 " --with(out)-recommends\tУказать, будут ли рекомендуемые пакеты\n"
 "                трактовать�� как �трогие зави�имо�ти.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fname       Читать информацию о ра�ширенном �тату�е aptitude из fname.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Скачать �пи�ок новых пакетов при запу�ке.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr "                (только в тек�товом интерфей�е)\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Запу�тить у�тановку при запу�ке.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Эта вер�и� aptitude не имеет коровьей СУПЕРСИЛЫ.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 msgid "trace"
 msgstr "trace"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 msgid "debug"
 msgstr "debug"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:399
+#: src/main.cc:365
 msgid "info"
 msgstr "info"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 msgid "warn"
 msgstr "warn"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:405
+#: src/main.cc:371
 msgid "error"
 msgstr "error"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 msgid "fatal"
 msgstr "fatal"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr "off"
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
@@ -5756,48 +5743,28 @@ msgstr ""
 "�еизве�тное им� уровн� протоколировани� «%s» (допу�тимы «trace», «debug», "
 "«info», «warn», «error», «fatal» или «off»)."
 
-#: src/main.cc:488
-#, c-format
-msgid "Invalid logger name \"%s\"."
-msgstr "�еверное им� команды ведени� протокола «%s»."
-
-#: src/main.cc:765
+#: src/main.cc:456
 #, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Ожидает�� чи�ло по�ле -q=\n"
+msgid "Invalid logger name \"%s\""
+msgstr "�еверное им� команды ведени� протокола «%s»"
 
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Ожидает�� чи�ло по�ле -q=, получен %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o требует�� параметр в виде ключ=значение, получен %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "�е указана зап�та� по�ле имени метки «%s».\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "СТР���ОСТЬ: получен неизве�тный код параметра\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr "--show-package-names|never"
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr "--show-package-names|auto"
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr "--show-package-names|always"
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
@@ -5806,29 +5773,29 @@ msgstr ""
 "�екорректный режим отображени� имён пакетов «%s» (должно быть «never», "
 "«auto» или «always»)."
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr "no-summary"
 
-#: src/main.cc:1027
+#: src/main.cc:781
 msgid "first-package"
 msgstr "first-package"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr "first-package-and-type"
 
-#: src/main.cc:1031
+#: src/main.cc:785
 msgid "all-packages"
 msgstr "all-packages"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr "all-packages-with-dep-versions"
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5839,37 +5806,41 @@ msgstr ""
 "package», «first-package-and-type», «all-packages» или «all-packages-with-"
 "dep-versions»."
 
-#: src/main.cc:1079
+#: src/main.cc:831
+#, fuzzy
+#| msgid ""
+#| "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may "
+#| "be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr ""
 "Можно указать только одно из: --auto-clean-on-startup, --clean-on-startup, -"
 "i и -u\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
+#, fuzzy
+#| msgid ""
+#| "-u, -i, and --clean-on-startup may not be specified in command-line mode "
+#| "(eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u, -i и --clean-on-startup не могут быть заданы в режиме командной �троки "
 "(например, � «install»)"
 
-#: src/main.cc:1105
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u, -i и --clean-on-startup не могут быть заданы � командой"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "�еизве�тна� команда «%s»\n"
+msgid "Unknown command \"%s\""
+msgstr "�еизве�тна� команда «%s»"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "�еобработанное и�ключение: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5887,7 +5858,7 @@ msgstr "Пои�к: "
 msgid "Search backwards for: "
 msgstr "Пои�к в обратную �торону: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Сапёр"
 
@@ -6097,7 +6068,7 @@ msgstr "Кодировка файла mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 19 17"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Пакет"
 
@@ -6178,8 +6149,8 @@ msgstr "<�/Д>"
 msgid "<none>"
 msgstr "<пу�то>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "виртуальный"
@@ -6314,7 +6285,7 @@ msgstr ""
 msgid "Internal error: Default column string is unparsable"
 msgstr "Внутренн�� ошибка: Колонку �троки по умолчанию нельз� разобрать"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Задачи"
 
@@ -6471,11 +6442,11 @@ msgstr "ИндекÑ�Ñ‹ Ñ�овпадениÑ� должны быть равны 1 Ð
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "Индек� �овпадени� %ls �лишком большой; е�ть до�тупные группы (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "П�КЕТЫ БЕЗ МЕТОК"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6485,10 +6456,6 @@ msgstr ""
 " Эти пакеты ещё не отне�ены к определенным категори�м в debtags, или база "
 "данных debtags не �уще�твует (проблема может быть решена у�тановкой debtags)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "МЕТК� ОТСУТСТВУЕТ"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "И�ходный пакет: "
@@ -7097,7 +7064,7 @@ msgstr "Загружает�� к�ш"
 msgid "Really quit Aptitude?"
 msgstr "Завершить работу � Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Изменение поведени� aptitude"
 
@@ -7177,7 +7144,7 @@ msgstr ""
 msgid "License"
 msgstr "Лицензи�"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 "Показать у�лови�, на которых можно копировать и ра�про�тран�ть aptitude"
@@ -7199,7 +7166,7 @@ msgstr "Оперативна� �правка"
 msgid "View a brief introduction to aptitude"
 msgstr "Про�мотреть краткое введение в aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Справка"
 
@@ -7228,7 +7195,7 @@ msgstr "Руковод�тво"
 msgid "FAQ"
 msgstr "Ч�ВО"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Показать �пи�ок ча�то задаваемых вопро�ов"
 
@@ -7270,15 +7237,15 @@ msgstr ""
 "и в�ё его �одержимое? Е�ли вы ответите «�ет», то �то �ообщение больше не "
 "по�вит��."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Показывать ход �качивани� пакетов"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Скачивание пакета"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7289,35 +7256,35 @@ msgstr ""
 "%n�енадёжные пакеты могут %B�компрометировать безопа�но�ть �и�темы%b. "
 "Продолжайте у�тановку, е�ли только вам точно �то нужно.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [вер�и� %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "�а �амом деле продолжить"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Прервать у�тановку"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Обзор у�танавливаемых пакетов"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Показать и/или выверить дей�тви�, которые будут выполнены"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "�екоторые неработо�по�обные пакеты были и�правлены:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Решени� данной проблемы � зави�имо�т�ми не �уще�твует!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7326,7 +7293,7 @@ msgstr ""
 "Убьём врем�, пока ищет�� решение проблемы � зави�имо�т�ми (нажмите «%s», "
 "чтобы попытать�� тщательнее)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7334,19 +7301,19 @@ msgstr ""
 "Дл� у�тановки/удалени� пакетов требуют�� админи�тративные права, которыми вы "
 "в данный момент не обладаете. Получить права �уперпользовател�? "
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Стать �уперпользователем"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "�е �тановить�� �уперпользователем"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "�ет пакетов дл� у�тановки, удалени� или обновлени�."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7356,19 +7323,19 @@ msgstr ""
 "быть обновлены, но вы не задали их обновление. Введите «U», чтобы пометить "
 "их дл� обновлени�."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Обновление �пи�ка пакетов"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Показывать ход обновлени� �пи�ка пакетов"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Обновление �пи�ка"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7376,23 +7343,23 @@ msgstr ""
 "Дл� обновлени� �пи�ка пакетов требуют�� админи�тративные права, которыми вы "
 "в данный момент не обладаете. Получить права �уперпользовател�? "
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Убьём врем� в пои�ках мин"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Очи�тка во врем� проце��а �качивани� невозможна"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Удаление загруженных файлов"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Загруженные файлы были удалены"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7400,11 +7367,11 @@ msgstr ""
 "Дл� очи�тки к�ша пакетов требуют�� админи�тративные права, которыми вы в "
 "данный момент не обладаете. Получить права �уперпользовател�?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "�едо�тупен apt к�ш пакетов; не будет выполнен auto-clean."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7413,7 +7380,7 @@ msgstr ""
 "Загруженные файлы � у�таревшими пакетами были удалены, о�вободит�� %sБ "
 "ди�кового про�тран�тва."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7421,121 +7388,121 @@ msgstr ""
 "Дл� удалени� у�таревших файлов требуют�� админи�тративные права, которыми вы "
 "в данный момент не обладаете. Получить права �уперпользовател�?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Больше решений нет."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "�е удало�ь найти решение, которое можно было бы применить."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Убьём врем�, пока ищет�� решение."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Разрешить зави�имо�ти"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "�айти решени� � неудовлетворёнными зави�имо�т�ми"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "�е удало�ь открыть %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Ошибка во врем� �бро�а �о�то�ни� решател�"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^У�тановить/удалить пакеты"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Обновить �пи�ок пакетов"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Пометить ^обновл�емые"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Забыть о новых пакетах"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Отменить в�е незаконченные дей�тви�"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Очи�тить к�ш пакетов"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Очи�тить ^у�таревшие файлы"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Перезагрузить к�ш пакетов"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Играть в �апёра"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^Стать �уперпользователем"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Выход"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Откат"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^У�тановить"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Пометить выделенный пакет дл� у�тановки или обновлени�"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "У^далить"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Пометить выделенный пакет дл� удалени�"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Вычи�тить"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Пометить выделенный пакет дл� удалени� вме�те � его файлами на�тройки"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^О�тавить"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Отменить любое дей�твие над выделенным пакетом"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Фик�ировать"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7543,11 +7510,11 @@ msgstr ""
 "Отменить любое дей�твие над выделенным пакетом и защитить его от дальнейших "
 "обновлений"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Отметить ^Auto"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7555,11 +7522,11 @@ msgstr ""
 "Отметить выделенные пакеты, как будто они были у�тановлены автоматиче�ки; "
 "они будут автоматиче�ки удалены, е�ли не о�танет�� пакетов, от них зави��щих"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Отметить ^Manual"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7567,11 +7534,11 @@ msgstr ""
 "Отметить выделенные пакеты, как будто они были у�тановлены вручную; они не "
 "будут удалены, пока вы вручную не �делаете �того"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Запретить вер�ию"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7579,19 +7546,19 @@ msgstr ""
 "Запретить у�тановку вер�ии выделенного пакета; новые вер�ии пакета будут "
 "у�танавливать�� как обычно"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "^Информаци�"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Показать больше информации о выделенном пакете"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "Цикл информации о пакете"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7601,94 +7568,94 @@ msgstr ""
 "отображать�� длинное опи�ание, �водка по �о�то�нию его зави�имо�тей или "
 "анализ почему требует�� �тот пакет."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^ChangeLog"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Показать �пи�ок изменений Debian выбранного пакета"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Ра��мотреть решение"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Ра��мотреть выделенное решение проблем � зави�имо�т�ми."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Применить решение"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Выполнить дей�тви� из выделенного решени�."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "Следующее решение"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Выбрать �ледующее решение проблем � зави�имо�т�ми."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "Предыдущее решение"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Выбрать предыдущее решение проблем � зави�имо�т�ми."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "Первое решение"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Выбрать первое решение проблем � зави�имо�т�ми."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "По�леднее решение"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr ""
 "Выбрать по�леднее решение проблем � зави�имо�т�ми, которое было найдено."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Переключить отказы"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Переключить �о�то�ние отказа выделенного дей�тви�."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Переключить одобрение"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Переключить �о�то�ние одобрени� выделенного дей�тви�."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "Показать цель"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Показать пакет, на который вли�ет выделенное дей�твие"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "�е ломать фик�ации"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7696,222 +7663,222 @@ msgstr ""
 "Отбро�ить в�е дей�тви�, которые привели бы к изменению �о�то�ни� "
 "зафик�ированных пакетов или у�тановке запрещённых вер�ий"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Пои�к"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Пои�к вперёд"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "^Пои�к назад"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Обратный пои�к"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "�айти �нова"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Повторить по�ледний пои�к"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Выполнить обратный пои�к �нова"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Повторить по�ледний пои�к в обратном направлении"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Ограничить �кран"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Применить фильтр к �пи�ку пакетов"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Безразмерный �кран"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Сн�ть фильтр �о �пи�ка пакетов"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "�айти ^неработо�по�обные"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "�айти �ледующий пакет � неудовлетворёнными зави�имо�т�ми"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "Предпочтени�"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "�а�тройки интерфей�а"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Изменить на�тройки, отно��щие�� к интерфей�у пользовател�"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Работа � зави�имо�т�ми"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Изменить на�тройки, отно��щие�� к тому как обрабатывают�� зави�имо�ти"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Разное"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Изменить другие на�тройки программы"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Отменить на�тройки"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Сбро�ить в�е на�тройки в значени� по умолчанию"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Следующее"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Перейти к �ледующему окну"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Предыдущее"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Перейти к предыдущему окну"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Закрыть"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Закрыть �то окно"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "�овое ^окно Пакета"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Создать новое окно пакета по умолчанию"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "^Проверка рекомендаций"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr ""
 "Про�мотр пакетов, которые рекомендуют�� дл� у�тановки, но ещё не у�тановлены."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "�овый пло�кий �пи�ок пакетов"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Показать в�е пакеты в �и�теме одним �пи�ком без категорий"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "�овый ^Debtags браузер"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Показывать пакеты �огла�но данным Debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "�овый ^браузер категорий"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Показывать пакеты �огла�но категори�м"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^О программе"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Показать информацию об �той программе"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Справка"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Показать �траницу помощи"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Руковод�тво пользовател�"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Показать подробное руковод�тво пользовател� программы"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^Ч�ВО"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^�ово�ти"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Показать важные изменени�, произошедшие в каждой вер�ии "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Лицензи�"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Дей�тви�"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Пои�к"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Параметры"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Окна"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7920,11 +7887,11 @@ msgstr ""
 "%ls: Меню %ls: Справка %ls: Выход %ls: Обновление %ls: Загр/У�тан/Удал "
 "пакетов"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -7952,9 +7919,50 @@ msgstr "�е удало�ь �качать �пи�ок изменений %s: %
 msgid "Downloading the changelog of %s"
 msgstr "Скачивает�� �пи�ок изменений %s"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Спи�ки изменений можно по�мотреть только у официальных пакетов Debian."
+#~ msgid "MISSING TAG"
+#~ msgstr "МЕТК� ОТСУТСТВУЕТ"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL дл� �качивани� �пи�ков изменений"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Эта на�тройка контролирует шаблон, который и�пользует�� дл� �качивани� "
+#~ "�пи�ка изменений � веб-�айта Debian. Её нужно мен�ть только, е�ли "
+#~ "изменил�� URL �пи�ка изменений."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s не официальный пакет Debian, невозможно отобразить его �пи�ок "
+#~ "изменений."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "�е удало�ь найти пакет, � именем «%s»"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "�е удало�ь проанализировать шаблон %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Ожидает�� чи�ло по�ле -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Ожидает�� чи�ло по�ле -q=, получен %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o требует�� параметр в виде ключ=значение, получен %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "СТР���ОСТЬ: получен неизве�тный код параметра\n"
+
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u, -i и --clean-on-startup не могут быть заданы � командой"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr ""
+#~ "Спи�ки изменений можно по�мотреть только у официальных пакетов Debian."
 
 #~ msgid "Err "
 #~ msgstr "Ош "
@@ -8118,10 +8126,6 @@ msgstr "Спи�ки изменений можно по�мотреть толь
 #~ "Уровень %d, на�троенный в %s::ProblemResolver::Tier-Names, не имеет "
 #~ "�лемента Name."
 
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Changelog не найден."
-
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "�е удало�ь �оздать временный файл: %s"
diff --git a/po/sk.gmo b/po/sk.gmo
index 5778c5e6..979d5c70 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index 40be6fa1..c02bf1f3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:29+0800\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -358,24 +358,10 @@ msgstr ""
 "sources.list."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL na sťahovanie záznamov o zmenách"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Táto voľba ur�uje šablónu, ktorá sa používa na sťahovanie záznamov zmien "
-"(changelog) z webstránky Debian. Túto voľbu by bolo nutné zmeniť iba ak by "
-"sa zoznamy zmien presunuli na iný URL."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Pred vlastnou operáciou zobraziť, �o sa bude vykonávať"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -383,13 +369,13 @@ msgstr ""
 "Ak je táto voľba zapnutá, pri spustení inštalácie vám aptitude zobrazí "
 "zhrnutie operácií, ktoré sa chystá vykonať."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 "Zabudnúť zoznam „nových“ balíkov pri každej aktualizácii zoznamu balíkov"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -397,12 +383,12 @@ msgstr ""
 "Ak je táto voľba zapnutá, aptitude vy�istí zoznam nových balíkov potom, �o "
 "aktualizujete zoznamy balíkov (napr. stla�ením „u“)."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Zabudnúť zoznam „nových“ balíkov pri každom (od)inštalovaní balíkov"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -411,13 +397,13 @@ msgstr ""
 "Ak je táto voľba zapnutá, aptitude vy�istí zoznam nových balíkov potom, �o "
 "spustíte inštaláciu alebo odstránenie balíkov z príkazového riadka."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "Nezobrazovať upozornenie, ak je prvá zmena vykonaná v režime iba na �ítanie"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -426,13 +412,13 @@ msgstr ""
 "Ak táto voľba %Bnie je%b zapnutá, aptitude zobrazí upozornenie, ke� zmeníte "
 "stav balíka a nemáte oprávnenie vykonať zmeny v systéme."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Varovať pri pokuse o spustenie privilegovanej operácie ako oby�ajný "
 "používateľ"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -444,11 +430,11 @@ msgstr ""
 "prihlásený ako root. Budete mať možnosť prihlásiť sa ako root a vykonať "
 "operáciu s oprávnením root."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Súbor na zaznamenávanie operácií"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -460,11 +446,11 @@ msgstr ""
 "%b“), zvyšok názvu sa interpretuje ako príkaz shellu, ktorý má prijať záznam "
 "na Å¡tandardnom vstupe."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Pri zvolení balíka automaticky vyriešiť jeho závislosti"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -476,12 +462,12 @@ msgstr ""
 "rýchlejšie ako zabudované riešenie závislostí, no môže poskytovať "
 "suboptimálne riešenia alebo v niektorých prípadoch úplne zlyhať."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Pred inštaláciou alebo odstránením automaticky opraviť poškodené balíky"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -492,11 +478,11 @@ msgstr ""
 "pokazené, aptitude automaticky použije aktuálny návrh riešenia problému. "
 "Inak vám dá aptitude možnosť vybrať riešenie problému pokazených závislostí."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Automaticky inštalovať odporú�ané balíky"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -514,11 +500,11 @@ msgstr ""
 "tiež zapnuté, balíky, ktoré odporú�a inštalovaný balík nebudú automaticky "
 "odstránené."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Automaticky odstrániť nepoužívané balíky"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -535,11 +521,11 @@ msgstr ""
 "tiež zapnuté, automaticky nainštalované balíky sa neodstránia ak ich "
 "odporú�a akýkoľvek inštalovaný balík."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Balíky, ktoré sa nikdy nemajú automaticky odstrániť"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -549,11 +535,11 @@ msgstr ""
 "keby na nich závisel inštalovaný balík: nikdy nebudú cieľom odstránenia ako "
 "nepoužívané."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr "Umožniť riešenie závislostí, ktoré pokazí podržané alebo zakázané"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -574,15 +560,15 @@ msgstr ""
 "balíka, ktorý bol práve vybraný na inštaláciu alebo aktualizáciu, kvôli "
 "chybe apt #470035."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Nastavenie rozhrania"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Správa závislostí"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Rôzne"
 
@@ -691,7 +677,7 @@ msgstr "Nie je možné nájsť zdrojový archív balíka „%s“\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Nie je možné uspokojiť závislosti pre zostavenie: %s.\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -700,7 +686,7 @@ msgstr ""
 "Poznámka: „%s“, poskytujúci virtuálny balík\n"
 "          „%s“, je už nainštalovaný.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -709,7 +695,7 @@ msgstr ""
 "Poznámka: „%s“, poskytujúci virtuálny balík\n"
 "          „%s“, sa už bude inštalovať.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -718,17 +704,22 @@ msgstr ""
 "„%s“ existuje v databáze balíkov, ale nie je reálny a\n"
 "žiadny balík ho neposkytuje.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "„%s“ je virtuálny balík; poskytuje ho:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Na inštaláciu si z nich musíte jeden zvoliť.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Balík „%s“ nemá kandidáta na inštaláciu"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -737,65 +728,58 @@ msgstr ""
 "Poznámka: je zvolený „%s“ namiesto\n"
 "          virtuálneho balíka „%s“\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s je už inštalovaný v požadovanej verzii (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s nie je momentálne nainštalovaný, preto sa nebude aktualizovať.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr ""
 "%s je už inštalovaný v požadovanej verzii, preto sa nebude aktualizovať.\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s nie je nainštalovaný, preto sa nepreinštaluje.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Balík %s nie je nainštalovaný, nebude sa teda odstraňovať\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "Balík %s nie je nainštalovaný, nemožno teda zakázať jeho aktualizáciu\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Balík %s sa nedá aktualizovať, nemožno teda zakázať jeho aktualizáciu\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Poznámka: na inštaláciu je zvolená úloha „%s: %s“\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Verziu balíka môžete zadať iba príkazom „install“ alebo príkazom „forbid-"
-"version“.\n"
+"version“"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Archív balíka môžete zadať iba príkazom „install“.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Archív balíka môžete zadať iba príkazom „install“"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -804,7 +788,7 @@ msgstr ""
 "Nenašiel sa balík „%s“ a viac než 40\n"
 "balíkov obsahuje „%s“ vo svojom názve.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -813,12 +797,12 @@ msgstr ""
 "Nenašiel sa balík „%s“, ale nasledujúce balíky\n"
 "obsahujú „%s“ vo svojom názve:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Nenašiel sa balík, ktorého názov alebo popis zodpovedá „%s“\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -836,7 +820,7 @@ msgstr ""
 "Nenašiel sa balík zodpovedajúci „%s“, ale nasledujúce balíky\n"
 "obsahujú „%s“ vo svojom popise:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Chybná operácia „%c“\n"
@@ -859,101 +843,86 @@ msgstr "Err "
 msgid "Changelog download failed: %s"
 msgstr "Záznam zmien %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Nedá sa spustiť sensible-pager - je tento systém Debian funk�ný?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "%s nie je oficiálny Debian balík, nedá sa zobraziť jeho zoznam zmien."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Nedá sa nájsť zoznam zmien balíka %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "Nedá sa nájsť zoznam zmien balíka %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: Príkaz clean neakceptuje žiadne argumenty\n"
+msgid "The clean command takes no arguments"
+msgstr "Príkaz clean neakceptuje žiadne argumenty"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Zmaže %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr ""
 "Nie je možné nájsť váš domovský prie�inok, ukladá sa do /tmp/function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Zmazaný %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: Príkaz autoclean neakceptuje žiadne argumenty\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Príkaz autoclean neakceptuje žiadne argumenty"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Na disku sa uvoľní %sB\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Na disku sa uvoľnilo %sB\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Nesprávna operácia %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Neo�akávaný vzor nasledujúci za „keep-all“"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "Nie je možné bezpe�ne vyriešiť závislosti, skúste spustiť s voľbou --full-"
-"resolver.\n"
+"resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Prerušené.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "download: musíte zadať aspoň jeden balík na stiahnutie\n"
+msgid "download: you must specify at least one package to download"
+msgstr "download: musíte zadať aspoň jeden balík na stiahnutie"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Nedá sa na�ítať zoznam zdrojov"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Nedá sa nájsť balík nazvaný „%s“"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -992,32 +961,23 @@ msgid "[Working]"
 msgstr "[Vykonáva sa]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
-"extract-cache-entries: vyžaduje sa aspoň jeden argument (adresár,\n"
-"do ktorého sa majú zapisovať súbory).\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Neexistuje balík „%s“"
+"extract-cache-entries: vyžaduje sa aspoň jeden argument (adresár, do ktorého "
+"sa majú zapisovať súbory)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr "Zadanému vzoru nevyhovujú žiadne balíky; niet �o robiť.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: Príkaz forget-new neakceptuje žiadne argumenty\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Príkaz forget-new neakceptuje žiadne argumenty"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Teoreticky by zabudol, ktoré balíky sú nové\n"
@@ -1125,17 +1085,17 @@ msgstr "Nasledujúce balíky sa aktualizujú:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Nasledujúce �iasto�ne nainštalované balíky sa nakonfigurujú:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Nasledujúce NUTNÉ balíky sa ODSTR�NIA!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Nasledujúce NUTNÉ balíky sa touto operáciou POŠKODIA:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1144,16 +1104,16 @@ msgstr ""
 "UPOZORNENIE: Vykonaním tejto operácie pravdepodobne poškodíte systém!\n"
 "             Ak PRESNE neviete, �o robíte, NEPOKRAČUJTE!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Som si vedomý, že je to zlý nápad"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Ak chcete pokra�ovať, napíšte „%s“:\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1170,7 +1130,7 @@ msgstr ""
 "istý tým, �o chcete urobiť.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1179,7 +1139,7 @@ msgstr ""
 "*** UPOZORNENIE ***   Ignorujú sa uvedené pravidlá dôvery, pretože\n"
 "                      %s::CmdLine::Ignore-Trust-Violations je „zapnuté“!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1192,7 +1152,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr "ano"
 
@@ -1201,96 +1161,96 @@ msgstr "ano"
 #. 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr "nie"
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Chcete ignorovať toto upozornenie a napriek tomu pokra�ovať?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Ak chcete pokra�ovať, napíšte „%s“; ak ukon�iť, zadajte „%s“: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Nerozpoznaný vstup. Zadajte bu�  „%s“ alebo „%s“.\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Nasledujúce balíky sú ODPORÚČANÉ, ale NEBUDÚ sa inštalovať:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Nasledujúce balíky sú NAVRHOVANÉ, ale NEBUDÚ sa inštalovať:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Žiadne balíky sa nebudú inštalovať, aktualizovať alebo odstraňovať.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu balíkov aktualizovaných, %lu nových nainštalovaných, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu preinštalovaných, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu degradovaných, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu na odstránenie a %lu neaktualizovaných.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Treba stiahnuť %sB/%sB archívov. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Treba stiahnuť %sB archívov. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Po rozbalení sa použije %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Po rozbalení sa uvoľní %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Nie je �o zobraziť -- zadajte názvy balíkov na riadok za „i“.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Pokra�ovanie stla�ením klávesu Enter."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Nenašli sa žiadne balíky -- zadajte názvy balíkov na riadok za „c“.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1299,30 +1259,30 @@ msgstr ""
 "Neboli nájdené žiadne balíky -- zadajte nula alebo viac koreňov vyhľadávania "
 "a následne názov balíka, ktorý sa má posúdiť.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "pokra�ovať v inštalovaní"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "prerušiť a skon�iť"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1330,12 +1290,12 @@ msgstr ""
 "zobraziť informácie o jednom alebo viacerých balíkoch; názvy balíkov by mali "
 "nasledovať za „i“"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1343,39 +1303,39 @@ msgstr ""
 "zobraziť Debian záznamy zmien jedného alebo viacerých balíkov; názvy balíkov "
 "by mali nasledovať za „c“"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "prepnúť zobrazenie informácií o závislostiach"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "prepnúť zobrazenie zmien vo veľkostiach balí�kov"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "prepnúť zobrazenie �ísel verzií"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1383,26 +1343,26 @@ msgstr ""
 "pokus o nájdenie dôvodu na inštaláciu jednotlivého balíka alebo vysvetlenie, "
 "pre�o by inštalovanie jedného balíka malo viesť k inštalácii iného balíka."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "spustiť automatické riešenie závislostí na vyriešenie pokazených závislostí."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "prejsť na vizuálne rozhranie"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1414,49 +1374,49 @@ msgstr ""
 "balíkov (alebo vzorov). Operácia sa vykoná na všetkých balíkoch, ktoré "
 "zadáte. Dostupné sú nasledujúce operácie:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "„+“ na inštaláciu balíkov"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "„+M“ na inštaláciu balíkov a ich okamžité ozna�enie ako automaticky "
 "inštalované"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "„-“ na odstránenie balíkov"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "„_“ na zabudnutie balíkov"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "„=“ na ponechanie balíkov v aktuálnej verzii"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 "„:“ na uchovanie balíkov v ich aktuálnom stave bez zmeny ich stavu na "
 "Ponechať"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "„&M“ na ozna�enie balíkov ako automaticky nainštalovaných"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "„&m“ na ozna�enie balíkov ako manuálne nainštalovaných"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "„&BD“ nainštaluje závislosti pre zostavenie balíka."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1464,29 +1424,29 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "Či sa má balík nainštalovať automaticky."
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Príkazy:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1494,20 +1454,20 @@ msgstr ""
 "aptitude sa nepodarilo nájsť riešenie týchto závislostí. Môžete ich sami "
 "vyriešiť ru�ne alebo ukon�iť napísaním „n“."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Chcete pokra�ovať? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Riešiť tieto poškodené závislosti ru�ne? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Chybná odpove�. Zadajte platný príkaz alebo zobrazte pomocníka zadaním „?“.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1515,7 +1475,7 @@ msgstr ""
 "Zadajte príkaz správy balíkov (ako „+ balík“ na inštaláciu balíka), „R“ pre "
 "pokus o automatické riešenie závislostí alebo „N“ pre prerušenie."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1526,7 +1486,7 @@ msgstr ""
 "Zobrazia sa informácie o závislostiach.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1537,7 +1497,7 @@ msgstr ""
 "Informácie o závislostiach sa nezobrazia.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1548,7 +1508,7 @@ msgstr ""
 "Verzie sa zobrazia.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1559,7 +1519,7 @@ msgstr ""
 "Verzie sa nezobrazia.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1570,7 +1530,7 @@ msgstr ""
 "Zobrazia sa zmeny veľkostí.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1702,6 +1662,11 @@ msgstr "O�akáva sa aspoň jeden pár balík/verzia nasledovaný „%c“"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "O�akávala verzia „%s“ po „%s“"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Neexistuje balík „%s“"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1850,7 +1815,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr "Chcem vyriešiť konflikty, ale riešenie konfliktov nebolo vytvorené."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1879,7 +1844,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Dostupné sú nasledujúce príkazy:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Súbor na zápis stavu riešenia:"
 
@@ -1913,7 +1878,7 @@ msgstr ""
 "*** CHYBA: hľadanie ukon�ila závažná výnimka. Môžete pokra�ovať\n"
 "           v hľadaní, ale niektoré riešenia budú nedostupné."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1922,25 +1887,24 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Nedajú sa vyriešiť závislosti aktualizácie (nebolo nájdené riešenie)."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Nedajú sa vyriešiť závislosti aktualizácie (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "iconv %s zlyhal.\n"
+msgid "iconv of %s failed"
+msgstr "iconv %s zlyhal"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "search: Musíte zadať aspoň jeden hľadaný výraz\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "search: Musíte zadať aspoň jeden hľadaný výraz"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1983,7 +1947,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Nasledujúce balíky majú nesplnené závislosti:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2206,7 +2170,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Poskytuje"
 
@@ -2220,15 +2184,9 @@ msgstr "Popis: "
 msgid "Homepage: "
 msgstr "Domovská stránka:"
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Nedá sa nájsť balík %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Nedá sa spracovať vzor %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Neboli nájdené žiadne balíky"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2239,14 +2197,13 @@ msgstr "Teoreticky stiahne/nainštaluje/odstráni balíky.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Vnútorná chyba, výber neskon�il"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Odstraňujú sa nepotrebné stiahnuté súbory"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: Príkaz update neakceptuje žiadne argumenty\n"
+msgid "The update command takes no arguments"
+msgstr "Príkaz update neakceptuje žiadne argumenty"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2263,42 +2220,36 @@ msgstr "Odstraňuje sa používateľská zna�ka „%s“ z balíka „%s“\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr "%s: príliš málo parametrov; o�akával sa aspoň názov zna�ky a balíka.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "K balíku %s nebola nájdená kandidátska verzia\n"
+msgid "No candidate version found for %s"
+msgstr "K balíku %s nebola nájdená kandidátska verzia"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "K balíku %s nebola nájdená žiadna aktuálna alebo kandidátska verzia\n"
+msgid "No current or candidate version found for %s"
+msgstr "K balíku %s nebola nájdená žiadna aktuálna alebo kandidátska verzia"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Nedá sa nájsť archív „%s“ balíka „%s“\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Nedá sa nájsť archív „%s“ balíka „%s“"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Nedá sa nájsť verzia „%s“ balíka „%s“\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Nedá sa nájsť verzia „%s“ balíka „%s“"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Vnútorná chyba: cmdline_find_ver bola poslaná neplatná hodnota %i!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Vnútorná chyba: cmdline_find_ver bola poslaná neplatná hodnota %i!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Nemôžete naraz zadať archív a verziu balíka\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Nemôžete naraz zadať archív a verziu balíka"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Nedá sa nájsť zoznam zmien balíka %s"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
@@ -2306,7 +2257,7 @@ msgstr[0] "%d poškodený [%+d]"
 msgstr[1] "%d poškodené [%+d]"
 msgstr[2] "%d poškodených [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
@@ -2314,7 +2265,7 @@ msgstr[0] "%d aktualizácia [%+d]"
 msgstr[1] "%d aktualizácie [%+d]"
 msgstr[2] "%d aktualizácií [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
@@ -2322,12 +2273,12 @@ msgstr[0] "%d new [%+d]"
 msgstr[1] "%d nové [%+d]"
 msgstr[2] "%d nových [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Aktuálny stav: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
@@ -2335,7 +2286,7 @@ msgstr[0] "Existuje %d novo zastaralý balík."
 msgstr[1] "Existujú %d novo zastaralé balíky."
 msgstr[2] "Existuje %d novo zastaralých balíkov."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
@@ -2343,57 +2294,85 @@ msgstr[0] "Existuje %d novo zastaralý balík:"
 msgstr[1] "Existujú %d novo zastaralé balíky:"
 msgstr[2] "Existuje %d novo zastaralých balíkov:"
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Chýba �iarka po názve zna�ky „%s“"
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Nedá sa nájsť balík %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Nedá sa nájsť zoznam zmien balíka %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Poznámka: na inštaláciu je zvolená úloha „%s: %s“\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Nedá sa nájsť zoznam zmien balíka %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Balíky:"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Zdrojový balík: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "Archív"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "search: Musíte zadať aspoň jeden hľadaný výraz\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2416,7 +2395,7 @@ msgstr "Aktuálne"
 msgid "Candidate"
 msgstr "Kandidát"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Inštalovať"
 
@@ -2518,23 +2497,20 @@ msgstr "Nebol nájdený dôvod na inštaláciu %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Balíky vyžadujúce %s:"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Balík s názvom „%s“ neexistuje."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Nebolo možné spracovať niektoré vzory."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
-"%s: tento príkaz vyžaduje aspoň jeden argument (balík, ktorý sa má "
-"preskúmať).\n"
+"%s: tento príkaz vyžaduje aspoň jeden argument (balík, ktorý sa má preskúmať)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2560,11 +2536,11 @@ msgstr "NESPLNEN�"
 msgid "UNAVAILABLE"
 msgstr "NEDOSTUPN�"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Zna�ky"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Používateľské zna�ky"
 
@@ -2768,32 +2744,32 @@ msgstr ""
 "nástroj apt už inštaluje balíky. Otvára sa v režime iba na �ítanie; žiadne "
 "vykonané zmeny stavov balíkov NEBUDÚ uchované!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 msgid "allowed"
 msgstr "umožniť_voľby"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "hlavný"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2863,36 +2839,44 @@ msgid ""
 msgstr ""
 "Neplatná váha vyhľadávania „%s“ (nie je „conflict“, „minimum“ ani celé �íslo)"
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "Vyrovnávacia pamäť balíkov nie je k dispozícií; nedajú sa stiahnuť a "
 "inštalovať balíky"
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Vnútorná chyba: nedá sa vytvoriť zoznam balíkov na stiahnutie"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Nepodarilo sa stiahnuť %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Niektoré archívy sa nedajú stiahnuť. Skúste spustiť aptitude update alebo --"
+"fix-missing"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Nedá sa opraviť kvôli nedostupným balíkom"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Chyba pri inštalácii balíka. Prebieha pokus o obnovu:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr "Nedá sa získať systémový zámok! (Možno beží �alší apt alebo dpkg?)"
@@ -3042,13 +3026,13 @@ msgstr ""
 "\n"
 "Záznam kompletný.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "Sťahujú sa balíky"
@@ -3162,18 +3146,18 @@ msgid ""
 msgstr ""
 "Súbory s indexami balíkov sú poškodené. Chýba pole Filename: pre balík %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Záznam zmien %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "Nepodarilo sa stiahnuť záznam zmien: %s"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Nepodarilo sa stiahnuť záznam zmien: %s"
@@ -3225,26 +3209,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Nepodarilo sa stiahnuť záznam zmien: %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Vytvára sa databáza zna�iek"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "Žiadne aktualizácie nie sú dostupné."
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "Žiadne aktualizácie nie sú dostupné."
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3391,40 +3376,40 @@ msgstr "Správca balíkov Aptitude"
 msgid "_File"
 msgstr "_Súbor"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Vykoná všetky nevykonané inštalácie a odstraňovania"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Zistí, �i nie sú k dispozícii novšie verzie balíkov"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Ozna�í všetky aktualizovateľné balíky, ktoré nie sú ponechané"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Zabudne, ktoré balíky sú „nové“"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Zruší všetky �akajúce inštalácie, odstránenia, ponechania a aktualizácie."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Odstráni stiahnuté súbory (balíky) z /var/cache/apt"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Odstráni súbory, ktoré sa už nedajú stiahnuť"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Znovu na�ítať obsah cache"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3434,7 +3419,7 @@ msgstr ""
 "Na používateľa root sa môžete prepnúť spustením „su“; týmto reštartujete "
 "program, ale vaše nastavenia sa zachovajú"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Ukon�í program"
 
@@ -3442,7 +3427,7 @@ msgstr "Ukon�í program"
 msgid "E_dit"
 msgstr "_Upraviť"
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Vráti späť poslednú operáciu alebo skupinu operácií s balíkmi"
 
@@ -3473,7 +3458,7 @@ msgid "_Help"
 msgstr "_Pomoc"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr "Palubná doska"
 
@@ -3481,19 +3466,19 @@ msgstr "Palubná doska"
 msgid "Update"
 msgstr "_Aktualizovať zoznam"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Balíky"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Náhľad"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Odstraňova�"
 
@@ -3671,7 +3656,7 @@ msgid "Fix Manually"
 msgstr "Opraviť manuálne"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Aktualizovať"
 
@@ -4212,11 +4197,11 @@ msgstr "Nainštalovaný"
 msgid "Reinstall"
 msgstr "Reinštalovať"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Degradovať"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Odstrániť"
 
@@ -4248,7 +4233,7 @@ msgstr "Aby ste mohli aktualizovať zoznam balíkov, musíte byť root"
 msgid "Download already running."
 msgstr "Sťahovanie už prebieha."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Aktualizácia zoznamu balíkov alebo ich inštalácia už prebieha."
 
@@ -4315,23 +4300,23 @@ msgstr "Chyba v balíku %s"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Otázka, �i sa má nahradiť konfigura�ný súbor %s"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Sťahujú sa balíky"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr "Poškodené balíky"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr "Zobraziť poškodené balíky"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr "Riešiť závislosti"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
@@ -4339,18 +4324,18 @@ msgstr[0] "%d balík je poškodený"
 msgstr[1] "%d balíky sú poškodené"
 msgstr[2] "%d balíkov je poškodených"
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr "Zobraziť zmeny"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr "Aplikovať zmeny"
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4361,7 +4346,7 @@ msgstr[2] "%d balíkov na inštaláciu"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
@@ -4369,53 +4354,53 @@ msgstr[0] "%d balík na odstránenie"
 msgstr[1] "%d balíky na odstránenie"
 msgstr[2] "%d balíkov na odstránenie"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr "Veľkosť na stiahnutie: %sB."
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr "Zna�ky %s:\n"
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr "Táto vlastnosť zatiaľ nie je implementovaná."
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr "Neimplementované"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr "Nainštalovať/aktualizovať"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr "Vy�istiť"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Zachovať"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Ponechať"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr "Nastaviť na automatické"
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr "Nastaviť na manuálne"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr "Prepnúť stav automaticky"
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4452,7 +4437,7 @@ msgstr "info"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4496,15 +4481,15 @@ msgstr "%s sa nainštaluje manuálne."
 msgid "Cache reloading, please wait..."
 msgstr "Obnovuje sa vyrovnávacia pamäť, �akajte prosím..."
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr "Hľadá sa..."
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr "Zostavuje sa pohľad"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Zostavuje sa pohľad"
@@ -5224,108 +5209,109 @@ msgstr "Neznámy typ zarovnania „%s“"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Triedenie podľa názvu nepoužíva žiadne argumenty"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Neplatný názov triediaceho mechanizmu"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Nepárová „(“ v popise triediaceho mechanizmu"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Neplatný triediaci mechanizmus „%s“"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Chyba pri dekódovaní multi-bajtového reťazca po „%ls“"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Chyba pri dekódovaní široko-bajtového reťazca po „%s“"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s skompilovaný %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompilátor: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Preložené vo�i:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  Verzia apt %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  Verzia NCurses: Neznáma\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  Verzia NCurses %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  verzia libsigc++: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Podpora Ept zapnutá.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Podpora Ept vypnutá.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  Gtk+ verzia %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  Gtk-- verzia %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Podpora Gtk+ vypnutá.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s skompilovaný %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Podpora Ept vypnutá.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5333,32 +5319,32 @@ msgstr ""
 "\n"
 "Aktuálne verzie knižníc:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  Verzia NCurses: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  Verzia cwidget: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Verzia Apt: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Použitie: aptitude [-S názsub] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [voľby] <operácia> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5367,42 +5353,42 @@ msgstr ""
 "  Operácie (ak nie sú zadané, aptitude spustí interaktívny režim):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Inštaluje/aktualizuje balíky.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Odstráni balíky.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Vy�istí balíky a ich konfigura�né súbory.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Ochráni balíky pred aktualizáciou.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Zruší ochranu balíka pred aktualizáciou.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Ozna�í balíky, že boli inštalované automaticky.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Ozna�í balíky, že boli inštalované manuálne.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5410,17 +5396,17 @@ msgid ""
 msgstr ""
 " forbid-version - Zakáže aptitude aktualizáciu na konkrétnu verziu balíka.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Stiahne zoznamy nových/aktualizovateľných balíkov.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Vykoná bezpe�nú aktualizáciu.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5429,52 +5415,52 @@ msgstr ""
 " full-upgrade - Vykoná aktualizáciu, pri ktorej možno nainštaluje a odstráni "
 "balíky.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr " build-dep    - Nainštaluje závislosti pre zostavenie balíka.\n"
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Zabudne, ktoré balíky sú „nové“.\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Vyhľadá balíky podľa názvu a/alebo výrazu.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Zobrazí podrobné informácie o balíku.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Zobrazí podrobné informácie o balíku.\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Odstráni stiahnuté .deb súbory balíkov.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Odstráni staré stiahnuté .deb súbory balíkov.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Zobrazí záznam zmien balíka.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Stiahne .deb súbor balíka.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5483,7 +5469,7 @@ msgstr ""
 " reinstall    - Stiahne a (pravdepodobne) preinštaluje aktuálne "
 "nainštalovaný balík.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5494,7 +5480,7 @@ msgstr ""
 "alebo\n"
 "                pre�o by jeden alebo viac balíkov vyžadovalo daný balík.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5507,17 +5493,17 @@ msgstr ""
 "ku\n"
 "                konfliktu s daným balíkom, keby bol nainštalovaný.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Voľby:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Tento pomocník.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
@@ -5525,18 +5511,18 @@ msgstr ""
 " --gui          Použiť grafické rozhranie GTK aj ak je vypnuté v "
 "konfigurácii.\n"
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 " --no-gui       Nepoužívať grafické rozhranie GTK ani ak je dostupné.\n"
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Tento pomocník.\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, fuzzy, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
@@ -5544,31 +5530,31 @@ msgstr ""
 " --gui          Použiť grafické rozhranie GTK aj ak je vypnuté v "
 "konfigurácii.\n"
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Iba simuluje, ni� v skuto�nosti nevykonáva.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Stiahne balíky, ale ni� neinštaluje ani neodstraňuje.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Vždy vyžadovať potvrdenie alebo operácie.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
 " -y             Na jednoduché áno/nie otázky odpovie automaticky „áno“.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5577,7 +5563,7 @@ msgstr ""
 " -F formát      Udáva formát na zobrazenie výsledkov hľadania; pozri "
 "manuál.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5585,34 +5571,34 @@ msgid ""
 msgstr ""
 " -O radenie      Udáva spôsob zoradenia výsledkov hľadania; pozri manuál.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w šírka       Udáva šírku zobrazenia výsledkov hľadania.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Agresívne sa pokúsi opraviť poškodené balíky.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Zobrazí verziu balíkov, ktoré sa majú inštalovať.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             Zobrazí závislosti automaticky zmenených balíkov.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Zobrazí zmenu v nainštalovanej veľkosti každého balíka.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5620,7 +5606,7 @@ msgid ""
 msgstr ""
 " -v             Zobrazí dodato�né informácie. (Môžete zadať niekoľkokrát.)\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
@@ -5628,7 +5614,7 @@ msgstr ""
 " -t [verzia]     Vyberie verziu vydania, z ktorého sa majú inštalovať "
 "balíky.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5637,12 +5623,12 @@ msgstr ""
 " -q             V príkazovom riadku, potlá�a indikátory inkrementálneho\n"
 "                postupu.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o kľú�=hodn   Nastaví konfigura�nú voľbu nazvanú „kľú�“.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5651,76 +5637,76 @@ msgstr ""
 " --with(out)-recommends\tNastaví, �i sa majú odporú�ané závislosti\n"
 "                brať ako silné závislosti.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S fname       Na�íta rozšírené stavové informácie zo súboru fname.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Pri štarte stiahne nové zoznamy balíkov.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr "                  (iba terminálové rozhranie)\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Pri štarte spustí inštaláciu.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Toto aptitude nemá schopnosti posvätnej kravy.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 msgid "trace"
 msgstr "trasovanie"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 msgid "debug"
 msgstr "ladenie"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:399
+#: src/main.cc:365
 msgid "info"
 msgstr "info"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 msgid "warn"
 msgstr "upozornenie"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:405
+#: src/main.cc:371
 msgid "error"
 msgstr "chyba"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 msgid "fatal"
 msgstr "kritická"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr "vypnuté"
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
@@ -5729,77 +5715,57 @@ msgstr ""
 "Neznáma úroveň protokolovania „%s“ (o�akávané „trasovanie“, „ladenie“, "
 "„info“, „upozornenie“, „chyba“, „kritická“ alebo „vypnuté“)."
 
-#: src/main.cc:488
-#, c-format
-msgid "Invalid logger name \"%s\"."
-msgstr "Neplatný názov protokolu „%s“."
-
-#: src/main.cc:765
+#: src/main.cc:456
 #, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Po -q= sa o�akáva �íslo\n"
+msgid "Invalid logger name \"%s\""
+msgstr "Neplatný názov protokolu „%s“"
 
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Po -q= sa o�akáva �íslo, zadané bolo %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o vyžaduje argument v tvare kľú�=hodnota, zadané bolo %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Chýba �iarka po názve zna�ky „%s“.\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "ZVL�ŠTNE: prijatý kód neznámej voľby\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr "bez-zhrnutia"
 
-#: src/main.cc:1027
+#: src/main.cc:781
 msgid "first-package"
 msgstr "prvý-balík"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr "prvý-balík-a-typ"
 
-#: src/main.cc:1031
+#: src/main.cc:785
 msgid "all-packages"
 msgstr "všetky-balíky"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr "všetky-balíky-so-závis-verziami"
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5810,37 +5776,41 @@ msgstr ""
 "package“, „first-package-and-type“, „all-packages“ alebo „all-packages-with-"
 "dep-versions“."
 
-#: src/main.cc:1079
+#: src/main.cc:831
+#, fuzzy
+#| msgid ""
+#| "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may "
+#| "be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr ""
 "Môžete zadať iba jednu z volieb --auto-clean-on-startup, --clean-on-startup, "
 "-i a -u\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
+#, fuzzy
+#| msgid ""
+#| "-u, -i, and --clean-on-startup may not be specified in command-line mode "
+#| "(eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u, -i a --clean-on-startup nemôžu byť použité v režime príkazového riadka "
 "(napr. s „install“)"
 
-#: src/main.cc:1105
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u, -i a --clean-on-startup nemôžu byť použité spolo�ne s príkazom"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Neznámy príkaz „%s“\n"
+msgid "Unknown command \"%s\""
+msgstr "Neznámy príkaz „%s“"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Neodchytená výnimka: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5858,7 +5828,7 @@ msgstr "Hľadať: "
 msgid "Search backwards for: "
 msgstr "Hľadať predchádzajúce: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Hľadanie mín"
 
@@ -6068,7 +6038,7 @@ msgstr "Kódovanie mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 13 30 17 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Balík"
 
@@ -6149,8 +6119,8 @@ msgstr "<N/A>"
 msgid "<none>"
 msgstr "<žiadne>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtuálny"
@@ -6284,7 +6254,7 @@ msgstr "Nedá sa zmeniť kódovanie formátu zobrazenia balíka po „%ls“"
 msgid "Internal error: Default column string is unparsable"
 msgstr "Vnútorná chyba: Štandardný reťazec stĺpca sa nedá spracovať"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Úlohy"
 
@@ -6439,11 +6409,11 @@ msgstr "Vzorové indexy musia byť 1 alebo vä�šie, nie \"%s\""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "Vzorový index %ls je príliš veľký; dostupné skupiny sú (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "NEOZNAČKOVANÉ BAL�KY"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6453,10 +6423,6 @@ msgstr ""
 " Tieto balíky neboli v debtags klasifikované alebo databáza debtags nie je "
 "prítomná (to môžete napraviť nainštalovaním debtags)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "CH�BAJÚCA ZNAČKA"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Zdrojový balík: "
@@ -7068,7 +7034,7 @@ msgstr "Na�ítava sa vyrovnávacia pamäť"
 msgid "Really quit Aptitude?"
 msgstr "Skuto�ne ukon�iť Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Zmeniť správanie aptitude"
 
@@ -7148,7 +7114,7 @@ msgstr ""
 msgid "License"
 msgstr "Licencia"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Zobrazí podmienky, za ktorých môžete aptitude kopírovať a šíriť"
 
@@ -7169,7 +7135,7 @@ msgstr "Online pomocník"
 msgid "View a brief introduction to aptitude"
 msgstr "Zobraziť stru�ný úvod do aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Pomoc"
 
@@ -7198,7 +7164,7 @@ msgstr "Manuálne"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Zobrazí zoznam �asto kladených otázok"
 
@@ -7240,15 +7206,15 @@ msgstr ""
 "odstrániť tento adresár a celý jeho obsah?  Ak si zvolíte „Nie“, táto správa "
 "sa už nebude zobrazovať."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Zobrazí priebeh sťahovania balíkov"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Stiahnutie Balíka "
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7260,35 +7226,35 @@ msgstr ""
 "inštaláciou by ste mali pokra�ovať iba v prípade, ak ste si istý tým, �o "
 "chcete urobiť.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [verzia %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Skuto�ne Pokra�ovať"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Prerušiť Inštaláciu"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Náhľad inštalácie balíkov"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Zobrazí a/alebo upraví operácie, ktoré sa majú vykonať"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Niektoré balíky boli poškodené a podarilo sa ich opraviť:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Na tieto problémy so závislosťami neexistuje žiadne riešenie!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7297,7 +7263,7 @@ msgstr ""
 "Po�as riešenia závislostí bol prekro�ený �as (dôkladnejšie hľadanie spustíte "
 "stla�ením „%s“)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7305,20 +7271,20 @@ msgstr ""
 "Inštalácia/odobranie balíkov vyžaduje administrátorské práva, ktoré "
 "momentálne nemáte. Chcete sa prepnúť na ú�et root?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Stať sa rootom"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Nestať sa rootom"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "Žiadne balíky nie sú ozna�ené na inštaláciu, aktualizáciu alebo odstránenie."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7328,19 +7294,19 @@ msgstr ""
 "balíky by sa síce mohli aktualizovať, ale nezvolili ste ich aktualizáciu. "
 "Aktualizáciu môžete vykonať klávesom „U“."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Aktualizujú sa zoznamy balíkov"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Zobrazí priebeh aktualizácie zoznamu balíkov"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Aktualizovať Zoznam"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7348,23 +7314,23 @@ msgstr ""
 "Aktualizácia zoznamu balíkov vyžaduje administrátorské práva, ktoré "
 "momentálne nemáte. Chcete sa prepnúť na ú�et root?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Využiť �as hľadaním mín."
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Čistenie po�as sťahovania nie je dovolené"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Odstraňujú sa stiahnuté súbory"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Stiahnuté balíky boli vymazané"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7372,19 +7338,19 @@ msgstr ""
 "Aktualizácia zoznamu balíkov vyžaduje práva správcu, ktoré momentálne "
 "nemáte. Chcete sa prepnúť na ú�et root?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 "Vyrovnávacia pamäť apt nie je k dispozícii; nedá sa automaticky �istiť."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Staré stiahnuté balíky boli vymazané, uvoľnilo sa %sB miesta na disku."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7392,122 +7358,122 @@ msgstr ""
 "Aktualizácia zoznamu balíkov vyžaduje práva správcu, ktoré momentálne "
 "nemáte. Chcete sa prepnúť na ú�et root?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Žiadne �alšie riešenia."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Nedá sa nájsť potvrdené riešenie"
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Vypšal �as po�as hľadania riešenia."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Riešiť Závislosti"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Hľadať riešenia nesplnených závislostí"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Nedá sa otvoriť %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Nastala chyba pri ukladaní stavu riešenia"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Inštalovať/odstrániť balíky"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Aktualizovať zoznam balíkov"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Ozna�iť A^ktualizovateľné"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Zabudnúť nové balíky"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Zrušiť �akajúce operácie"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "Vy�istiť ^cache s balíkmi"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Vy�istiť staré súb^ory"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "Znovu na�ítať cache"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "Zahrať si mínové ^pole"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Stať sa rootom"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "Ukon�iť"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Späť"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Inštalovať"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Ozna�í aktuálne zvolený balík na inštaláciu alebo aktualizáciu"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "Odst^rániť"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Ozna�í aktuálne zvolený balík na odstránenie"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "Vy�istiť"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Ozna�í aktuálne zvolený balík na odstránenie vrátane konfigura�ných súborov"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "Ponechať"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Na zvolenom balíku zruší všetky operácie"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "Ponechať"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7515,11 +7481,11 @@ msgstr ""
 "Na zvolenom balíku zruší všetky operácie a ochráni ho pred budúcimi "
 "aktualizáciami."
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Ozna�iť ^automaticky"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7527,11 +7493,11 @@ msgstr ""
 "Ozna�í zvolený balík ako inštalovaný automaticky; ak na ňom nebudú závisieť "
 "iné balíky, automaticky sa odstráni"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Ozna�iť ^Manuálne"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7539,11 +7505,11 @@ msgstr ""
 "Ozna�í zvolený balík, ako by bol nainštalovaný manuálne; neodstráni sa, "
 "pokiaľ ho neodstránite sami"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "Zakázať ^verziu"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7551,19 +7517,19 @@ msgstr ""
 "Zakáže inštalovanie kandidátskej verzie balíka; novšie verzie balíka sa budú "
 "inštalovať ako zvy�ajne"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformácie"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Zobrazí �alšie informácie o zvolenom balíku"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "C^yklovať informácie o balíkoch"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7573,59 +7539,59 @@ msgstr ""
 "dlhý popis balíka, zhrnutie stavu závislosti alebo analýza pre�o je balík "
 "potrebný."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Zobrazí zoznam zmien vo zvolenom balíku"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Vyskúšať Riešenie"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Preskúša aktuálne ozna�ené riešenie problémov so závislosťami."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Použiť ^Riešenie"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Vykoná operácie, ktoré sú zahrnuté v aktuálne zvolenom riešení."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "Ďalšie Rieše^nia"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Zvolí �alšie riešenie problémov so závislosťami."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^Predchádzajúce Riešenie"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Zvolí predchádzajúce riešenie problémov so závislosťami."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^Prvé Riešenie"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Zvolí prvé riešenie problémov so závislosťami."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "^Posledné Riešenie"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7633,35 +7599,35 @@ msgstr ""
 "Zvolí posledné riešenie problémov so závislosťami, ktoré bolo doteraz "
 "vygenerované."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Prepnúť ^Zamietnuté"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Prepína, �i je aktuálne zvolená operácia zamietnutá."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Prepnúť ^Schválené"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Prepnína, �i je aktuálne zvolená operácia schválená."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Zobraziť Cieľ"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Zobrazí balíky, ktorých sa bude týkať zvolená operácia"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Odmietnuť porušenie ^Podržania"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7669,135 +7635,135 @@ msgstr ""
 "Odmietne všetky �innosti, ktoré by zmenili stav podržaných balíkov alebo "
 "nainštalovali zakázané verzie"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "Hľadať"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Hľadá dopredu"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "^Hľadaj Spätne"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Hľadá spätne"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Hľadať znova"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Zopakuje posledné hľadanie"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Hľadať znova Spätne"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Zopakuje posledné hľadanie v opa�nom smere"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "Obmedziť zobrazenie"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Na zoznam balíkov aplikuje výberový filter"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "Zrušiť obmedzenie"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Odstráni filter aplikovaný na zoznam balíkov"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Hľadať porušené"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Hľadá �alší balík s nesplnenými závislosťami"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "Nastavenia"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "Nastavenie zobrazenia"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Zmení nastavenia, ktoré ovplyvňujú používateľské rozhranie"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "Správa závislostí"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Zmení nastavenia, ktoré ovplyvňujú spôsob riešenia závislostí"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "Rôzne"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Zmení rôzne nastavenia programu"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "Pôvodné nastavenia"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Vráti všetky nastavenia do pôvodného stavu"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "Ďalší"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Zobrazí �alší pohľad"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Predchádzajúce"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Zobrazí predchádzajúci pohľad"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "Zavrieť"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Zavrie tento pohľad"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "No^vý pohľad na balíky"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Vytvorí nový štandardný pohľad na balíky"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Audit ^Odporú�aní"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7805,87 +7771,87 @@ msgstr ""
 "Zobrazí balíky, ktoré je odporú�ané inštalovať, ale momentálne nie sú "
 "nainštalované."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Nový ^Plochý Zoznam Balíkov"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Zobrazí všetky balíky v systéme ako jeden nekategorizovaný zoznam"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Nový Prehliada� ^Debtags"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Prehliada balíky s použitím debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Nový prehliada� kategórií"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Prehliada balíky podľa kategórií"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "O progr^ame"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Zobrazí informácie o programe"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "Pomoc"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Zobrazí on-line pomoc"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "Používateľská príru�ka"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Zobrazí podrobnú príru�ku tohto programu"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Novinky"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Zobrazí dôležité zmeny v každej verzii"
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licencia"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Operácie"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Hľadať"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Voľby"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Pohľady"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7894,11 +7860,11 @@ msgstr ""
 "%ls: Menu  %ls: Pomoc  %ls: Koniec  %ls: Aktualizácia  %ls: Stiahnuť/"
 "Inštalovať/Odstrániť"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -7926,9 +7892,48 @@ msgstr "Nepodarilo sa stiahnuť záznam zmien: %s"
 msgid "Downloading the changelog of %s"
 msgstr "Sťahujú sa záznamy zmien"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Môžete prehliadať zoznamy zmien iba oficiálnych Debian balíkov."
+#~ msgid "MISSING TAG"
+#~ msgstr "CH�BAJÚCA ZNAČKA"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL na sťahovanie záznamov o zmenách"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Táto voľba ur�uje šablónu, ktorá sa používa na sťahovanie záznamov zmien "
+#~ "(changelog) z webstránky Debian. Túto voľbu by bolo nutné zmeniť iba ak "
+#~ "by sa zoznamy zmien presunuli na iný URL."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s nie je oficiálny Debian balík, nedá sa zobraziť jeho zoznam zmien."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Nedá sa nájsť balík nazvaný „%s“"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Nedá sa spracovať vzor %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Po -q= sa o�akáva �íslo\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Po -q= sa o�akáva �íslo, zadané bolo %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o vyžaduje argument v tvare kľú�=hodnota, zadané bolo %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "ZVL�ŠTNE: prijatý kód neznámej voľby\n"
+
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u, -i a --clean-on-startup nemôžu byť použité spolo�ne s príkazom"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Môžete prehliadať zoznamy zmien iba oficiálnych Debian balíkov."
 
 #~ msgid "Unable to open /usr/share/tasksel/debian-tasks.desc"
 #~ msgstr "Nedá sa otvoriť /usr/share/tasksel/debian-tasks.desc"
@@ -8090,10 +8095,6 @@ msgstr "Môžete prehliadať zoznamy zmien iba oficiálnych Debian balíkov."
 #~ "Váhe %d nastavenej pomocou %s::ProblemResolver::Tier-Names chýba položka "
 #~ "Name."
 
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Nebol nájdený žiadny záznam zmien."
-
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Nedá sa vytvoriť do�asný súbor: %s"
diff --git a/po/sv.gmo b/po/sv.gmo
index 4abe77cd..9c3f5ea1 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 6cffcb47..15b8c455 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-05-23 11:46+0800\n"
 "Last-Translator: Martin Bagge <brother@bsnet.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
@@ -369,23 +369,10 @@ msgstr ""
 "sources.list,"
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL att använda för att hämta ändringsloggar"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Det här alternativet styr utseendet på adressen för att hämta Debians "
-"ändringsloggar. Du ska vanligen inte behöva ändra detta."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Visa en förhandsgranskning av vad som kommer att göras innan det sker"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -393,12 +380,12 @@ msgstr ""
 "Om det här alternativet väljs kommer aptitude först att visa en "
 "förhandsgranskning av de åtgärder som kommer att utföras."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Glöm vilka paket som är \"nya\" när paketlistan blir uppdaterad"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -406,12 +393,12 @@ msgstr ""
 "Om det här alternativet väljs kommer aptitude att rensa listan över nya "
 "paket om du väljer att uppdatera paketlistan (t.ex. genom att trycka 'u')."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Glöm vilka paket som är \"nya\" när paket installeras eller tas bort"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -421,12 +408,12 @@ msgstr ""
 "efter att du genomfört en installation eller avinstallation av ett paket "
 "från kommandoraden."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "Visa inte en varning när den första ändringen sker i skrivskyddat läge"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -436,12 +423,12 @@ msgstr ""
 "när du förändrar tillståndet för ett paket och inte har tillåtelse att "
 "genomföra förändringar i systemet."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Varna vid försök att göra en priviligierad åtgärd som en icke-rootanvändare"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -454,11 +441,11 @@ msgstr ""
 "erbjudas möjligheten att logga in som root och genomföra åtgärden med "
 "priviligierade rättigheter."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Fil att skriva åtgärdslogg till"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -470,11 +457,11 @@ msgstr ""
 "pipe (%B|%B) kommer resterande del av filnamnet att tolkas som ett skal-"
 "kommando som tar emot loggen på standard input."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Lös automatiskt beroendeproblem för ett paket när det väljs"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -486,12 +473,12 @@ msgstr ""
 "Detta går mycket fortare än den inbyggda beroendelösaren men kan å andra "
 "sidan leda till ooptimala  val i vissa fall."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Rätta automatiskt till trasiga paket innan installation eller borttagning"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -503,11 +490,11 @@ msgstr ""
 "från beroendelösaren. Annars kommer aptitude fråga hur du vill lösa de "
 "trasiga beroendena."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Installera rekommenderade paket automatiskt"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -525,11 +512,11 @@ msgstr ""
 "\"också är aktiverat kommer paket som är rekomenderade av ett annat "
 "installerat paket inte att tas bort automatiskt."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Ta automatiskt bort oanvända paket"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -547,11 +534,11 @@ msgstr ""
 "är aktiverat kommer automatiskt installerade paket inte tas bort om något "
 "annat installerat paket rekomenderar dem."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Paket som aldrig ska tas bort automatiskt."
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -561,12 +548,12 @@ msgstr ""
 "installerat paket beror på dem. De kommer aldrig att bli borttaget som ett "
 "oanvänt paket."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Tillåt förslag på beroendelösning som bryter mot 'håll kvar' och 'förbjud'"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -587,15 +574,15 @@ msgstr ""
 "just har markerats för installation eller uppgradering, se vidare bugg "
 "#470035."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Gränssnitt"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Beroendehantering"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Diverse"
 
@@ -699,7 +686,7 @@ msgstr "Kunde inte hitta källpaket för \"%s\".\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Beroenden för att köra byggnation av källan saknas: \"%s\".\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -708,7 +695,7 @@ msgstr ""
 "Notera: \"%s\", tillhandahåller det virtuella paketet\n"
 "      \"%s\", är redan installerad.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -717,7 +704,7 @@ msgstr ""
 "Notera: \"%s\", tillhandahåller det virtuella paketet\n"
 "      \"%s\", är redan på väg att installeras.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -726,17 +713,22 @@ msgstr ""
 "\"%s\" finns i paketdatabasen men det är inte\n"
 "ett riktigt paket och inget paket tillhandahåller det.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" är ett virtuellt paket som tillhandahålls av:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Du måste välja en att installera.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Paketet \"%s\" har ingen installationskandidat"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -745,69 +737,62 @@ msgstr ""
 "Notera: väljer \"%s\" istället för det\n"
 "      virtuella paketet \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s är redan installerat med den begärda versionen (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 "%s är för tillfället inte installerat så det kommer inte att installeras "
 "om.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s är redan installerat med den begärda versionen (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 "%s är för tillfället inte installerat så det kommer inte att installeras "
 "om.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Paketet %s är inte installerat så det kommer inte att tas bort\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 "Paketet %s är inte installerat, kan därför inte förbjuda en uppgradering\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Paketet %s är inte uppgraderingsbart, kan därför inte förbjuda en "
 "uppgradering\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Notera: väljer funktionen \"%s: %s\" för installation\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Du kan endast ange en paketversion med ett \"install\"-kommando eller ett "
-"\"forbid-version\"-kommando.\n"
+"\"forbid-version\"-kommando"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Du kan endast ange ett paketarkiv med ett \"install\"-kommando.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Du kan endast ange ett paketarkiv med ett \"install\"-kommando"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -816,7 +801,7 @@ msgstr ""
 "Kunde inte hitta paketet \"%s\" och mer än 40\n"
 "paket innehåller \"%s\" i sina namn.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -825,13 +810,13 @@ msgstr ""
 "Kunde inte hitta paketet \"%s\".  Dock så innehåller\n"
 "följande paket \"%s\" i sina namn:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Kunde inte hitta några paket vars namn eller beskrivning matchade \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -849,7 +834,7 @@ msgstr ""
 "Kunde inte hitta några paket som matchade \"%s\".  Dock innehåller\n"
 "följande paket \"%s\" i sina beskrivningar:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Felaktigt åtgärdstecken \"%c\"\n"
@@ -872,103 +857,87 @@ msgstr "Fel"
 msgid "Changelog download failed: %s"
 msgstr "Ändringslogg för %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Kan inte köra sensible-pager, är detta ett fungerande Debiansystem?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s är inte ett officiellt Debianpaket, kan inte visa dess ändringslogg."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Kunde inte hitta ändringsloggen för %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "Kunde inte hitta ändringsloggen för %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "F: Rensningskommandot tar inga argument\n"
+msgid "The clean command takes no arguments"
+msgstr "Rensningskommandot tar inga argument"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Radera %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr "Kunde inte lokalisera din hemkatalog, sparar till /tmp/function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Radera %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "F: Automatisk rensning-kommandot tar inga argument\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Automatisk rensning-kommandot tar inga argument"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Kommer ta %sB mindre plats\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Frigjorde %sB diskplats\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ogiltig åtgärd %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Oväntat mönsterargument följt efter \"keep-all\""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "Kunde inte lösa beroenden på ett säkert sått, försök använda växeln --full-"
-"resolver.\n"
+"resolver"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Avbryt.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "hämtning: du måste åtminstone ange ett paket att hämta\n"
+msgid "download: you must specify at least one package to download"
+msgstr "hämtning: du måste åtminstone ange ett paket att hämta"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Kunde inte läsa källistan"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Kunde inte hitta ett paket med namnet \"%s\""
-
 # Kbabel marked this one as faulty, poedit
 # shows no error however. maybe it's correct?
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1008,32 +977,23 @@ msgid "[Working]"
 msgstr "[Arbetar]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 "uppackning av buffert-delar: åtminstone ett argument krävs (sökvägen för "
-"skrivning).\n"
+"skrivning)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Inget sådant paket \"%s\""
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr "Inga paket hittades med den angivna sökningen, inget att göra.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "F: Glöm nya-kommandot tar inga argument\n"
+msgid "The forget-new command takes no arguments"
+msgstr "Glöm nya-kommandot tar inga argument"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Kommer att glömma vilka paket som är nya\n"
@@ -1143,17 +1103,17 @@ msgstr "Följande paket kommer att bli uppgraderade:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Följande delvis installerade paket kommer att konfigureras:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Följande SYSTEMKRITISKA paket kommer att TAS BORT!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Följande SYSTEMKRITISKA paket kommer bli TRASIGA av denna åtgärd:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1162,16 +1122,16 @@ msgstr ""
 "VARNING: Denna åtgärd kan möjligen skada ditt system!\n"
 "         Fortsätt INTE om du inte vet EXAKT vad du gör!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Jag vet att det är en mycket dålig ide"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "För att fortsätta, skriv in frasen \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1189,7 +1149,7 @@ msgstr ""
 "detta är vad du vill göra.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1198,7 +1158,7 @@ msgstr ""
 "*** VARNING ***   Ignorerar dessa tillitsöverträdelser för att\n"
 "                  %s::CmdLine::Ignore-Trust-Violations är \"true\"!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1211,7 +1171,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1220,96 +1180,96 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Vill du ignorera denna varning och fortsätta ändå?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "För att fortsätta, ange \"%s\"; för att avbryta, ange \"%s\": "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Okänd inmatning.  Ange antingen \"%s\" eller \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Följande paket är REKOMMENDERADE men kommer INTE att installeras:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Följande paket är FÖRESLAGNA men kommer INTE att installeras:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Inga paket kommer att installeras, uppgraderas eller tas bort.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paket att uppgradera, %lu att nyinstallera. "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu att ominstallera, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu att nedgradera, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu att ta bort och %lu inte uppgraderade.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Behöver hämta %sB/%sB arkiv. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Behöver hämta %sB arkiv. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Efter uppackning kommer %sB diskplats att användas.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Efter uppackning kommer %sB diskplats att frigöras.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Inga paket att visa -- ange paketnamnen på raden efter \"i\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Tryck på Return för att fortsätta."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Inga paket hittades -- ange paketnamnen på raden efter \"c\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1318,42 +1278,42 @@ msgstr ""
 "Inga paket hittades -- ange noll eller fler rötter för sökningen efter "
 "paketet för att korrigera.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "fortsätt med installationen"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "avbryt och avsluta"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr ""
 "visa information om ett eller flera paket, paketnamnen bör anges efter \"i\""
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1361,39 +1321,39 @@ msgstr ""
 "visa Debians ändringslogg för ett eller flera paket, paketnamnen bör anges "
 "efter \"c\""
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "växla visningen av beroendeinformation"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "växla visningen av ändringar i paketstorlekar"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "växla visningen av versionsnummer"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1401,25 +1361,25 @@ msgstr ""
 "försök hitta en anledning att installera ett ensamt paket eller förklara "
 "varför installation av ett paket leder till att ett annat paket."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr "kör den automatiska beroendelösaren för att laga trasiga beroenden."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "gå över till fullständigt visuellt läge"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1431,49 +1391,49 @@ msgstr ""
 "mönster).  Åtgärden kommer att verkställas på alla paket som du listar.  "
 "Följande åtgärder finns tillgängliga:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "\"+\" för att installera paket"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "\"+M\" för att installera paket och omedelbart flagga dem som automatiskt "
 "installerade"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "\"-\" för att ta bort paket"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "\"_\" för att rensa paket"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "\"=\" för att hålla tillbaka paket"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 "\":\" för att behålla paketen i sitt nuvarande tillstånd utan att hålla dem "
 "tillbaka"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "\"&M\" för att markera paket som automatiskt installerade"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "\"&m\" för att markera paket som manuellt installerade"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "\"&BD\" för att installera bygg-beroenden för ett paket."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1481,29 +1441,29 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "\"&M\" för att markera paket som automatiskt installerade"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Kommandon:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1511,19 +1471,19 @@ msgstr ""
 "aptitude kunde inte hitta en lösning för dessa beroenden. DU kan lösa de "
 "själv manuellt eller trycka 'n' för att avsluta."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Vill du fortsätta? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Lösa dessa beroenden manuellt? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "Ogiltigt svar.  Ange ett giltigt kommando eller \"?\" för hjälp.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1532,7 +1492,7 @@ msgstr ""
 "paket), 'R' för att försöka automatisk beroendelösning eller 'N' för att "
 "avbryta."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1543,7 +1503,7 @@ msgstr ""
 "Information om beroenden kommer att visas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1554,7 +1514,7 @@ msgstr ""
 "Information om beroenden kommer inte att visas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1565,7 +1525,7 @@ msgstr ""
 "Versioner kommer att visas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1576,7 +1536,7 @@ msgstr ""
 "Versioner kommer inte att visas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1587,7 +1547,7 @@ msgstr ""
 "Storleksändringar kommer att visas.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1720,6 +1680,11 @@ msgstr "Förväntade åtminstone ett paket/versionspar efter \"%c\""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Förväntade version eller \"%s\" efter \"%s\""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Inget sådant paket \"%s\""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1868,7 +1833,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr "Jag vill lösa beroendekonflikter men det finns ingen beroendelösare."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1897,7 +1862,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Följande kommandon finns tillgängliga:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Fil att skriva lösningstillstånd till: "
 
@@ -1930,7 +1895,7 @@ msgstr ""
 "*** FEL: sökningen avbröts av ett ödesdigert undantag.  Du kan\n"
 "           fortsätta sökningen men några lösningar kommer inte vara nåbara."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1939,25 +1904,24 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Kunde inte lösa beroenden! Ger upp... (lösning saknas)"
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Kunde inte lösa beroenden (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "iconv för %s misslyckades.\n"
+msgid "iconv of %s failed"
+msgstr "iconv för %s misslyckades"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "sökning: Du måste ange åtminstone en sökterm\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "sökning: Du måste ange åtminstone en sökterm"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2000,7 +1964,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Följande paket har otillfredsställda beroenden:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NOLL>"
@@ -2223,7 +2187,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Tillhandahåller"
 
@@ -2237,15 +2201,9 @@ msgstr "Beskrivning: "
 msgid "Homepage: "
 msgstr "Webbplats:"
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Kunde inte hitta paketet %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Kunde inte tolka mönstret %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Inga paket hittades"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2256,14 +2214,13 @@ msgstr "Kommer att hämta/installera/ta bort paket.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Internt fel, sorteringen färdigställdes inte"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Tar bort hämtade och föråldrade filer"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "F: Uppdateringskommandot tar inte några argument\n"
+msgid "The update command takes no arguments"
+msgstr "Uppdateringskommandot tar inte några argument"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2282,132 +2239,154 @@ msgstr ""
 "%s: felaktigt antal argument; borde varit åtminstone ett namn på en etikett "
 "och ett paket.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Ingen kandidatversion hittades för %s\n"
+msgid "No candidate version found for %s"
+msgstr "Ingen kandidatversion hittades för %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Ingen aktuell eller kandidatversion hittades för %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "Ingen aktuell eller kandidatversion hittades för %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Kunde inte hitta arkivet \"%s\" för paketet \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Kunde inte hitta arkivet \"%s\" för paketet \"%s\""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Kunde inte hitta versionen \"%s\" av paketet \"%s\"\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Kunde inte hitta versionen \"%s\" av paketet \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Internt fel: ogiltiga värdet %i skickades till cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Internt fel: ogiltiga värdet %i skickades till cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Du kan inte ange både ett arkiv och en version för ett paket\n"
-
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Kunde inte hitta ändringsloggen för %s"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Du kan inte ange både ett arkiv och en version för ett paket"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d trasig [%+d]"
 msgstr[1] "%d trasiga [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d uppdatering [%+d]"
 msgstr[1] "%d uppdateringar [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d ny [%+d]"
 msgstr[1] "%d nya [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Nuvarande status: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "Det finns %d nytt inaktuellt paket."
 msgstr[1] "Det finns %d nya inaktuella paket."
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "Det finns %d nytt inaktuellt paket."
 msgstr[1] "Det finns %d nya inaktuella paket."
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Saknade komma efter etikettnamnet \"%s\""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Kunde inte hitta paketet %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Kunde inte hitta ändringsloggen för %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Notera: väljer funktionen \"%s: %s\" för installation\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Kunde inte hitta ändringsloggen för %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Paket"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Källpaket: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "Arkiv"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "sökning: Du måste ange åtminstone en sökterm\n"
 
 # baserat på hur tyskarna gjorde sin översättning. helt konstigt
@@ -2431,7 +2410,7 @@ msgstr "Aktuell"
 msgid "Candidate"
 msgstr "Kandidat"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Installera"
 
@@ -2535,23 +2514,21 @@ msgstr "Kunde inte hitta anledning för att installera %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Paketen är beroende av %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Kunde inte hitta ett paket med namnet \"%s\"."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Kunde inte tolka sökmönstret."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 "%s: det här kommandot kräver åtminstone ett argument (paketet som "
-"efterfrågas).\n"
+"efterfrågas)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2577,11 +2554,11 @@ msgstr "OTILLFREDSSTÄLLT"
 msgid "UNAVAILABLE"
 msgstr "OTILLGÄNGLIGT"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Taggar"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Användaretiketter"
 
@@ -2785,32 +2762,32 @@ msgstr ""
 "apt-verktyg redan installerar paket.  Öppnar i skrivskyddat läge, eventuella "
 "ändringar du gör med tillståndet på paketen kommer INTE att behållas!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 msgid "allowed"
 msgstr "Tillåtna val"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "main"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2877,35 +2854,43 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 "Paketcachen finns inte tillgänglig, kan inte hämta och installera paket."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Internt fel: kunde inte generera lista på paket för hämtning"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Misslyckades med att hämta %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Vissa arkiv kunte inte hämtas. Prova att köra \"aptitude update\" eller med "
+"--fix-missing."
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Kunde inte rätta till för otillgängliga paket"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "En paketinstallation misslyckades.  Försöker att återhämta:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3055,13 +3040,13 @@ msgstr ""
 "\n"
 "Logg färdig.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "Hämtar paket"
@@ -3172,18 +3157,18 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Paketindex är skadat. Inget \"Filename:\"-fält för paketet %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Ändringslogg för %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "URL att använda för att hämta ändringsloggar"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL att använda för att hämta ändringsloggar"
@@ -3234,26 +3219,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Kunde inte tolka mönstret %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Bygger taggdatabas"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "Inte installerat"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "Inte installerat"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3401,42 +3387,42 @@ msgstr ""
 msgid "_File"
 msgstr "Falskt"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Genomför alla väntande installationer och borttagningar"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Leta efter nya versioner av paket"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Markera alla uppgraderingsbara paket som inte hålls kvar för uppgradering"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Glöm vilka paket som är \"nya\""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Avbryt alla väntande installationer, borttagningar, tillbakahållningar och "
 "uppgraderingar."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Ta bort paketfiler som tidigare har hämtats"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Ta bort paketfiler som inte längre kan hämtas"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Läs om paketcachen"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3446,7 +3432,7 @@ msgstr ""
 "Kör \"su\" för att bli root, detta kommer att starta om programmet men dina "
 "inställningar kommer att bevaras"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Avsluta programmet"
 
@@ -3454,7 +3440,7 @@ msgstr "Avsluta programmet"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Ångra den senaste paketåtgärden eller gruppoperationer"
 
@@ -3488,7 +3474,7 @@ msgid "_Help"
 msgstr "Hjälp"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3497,19 +3483,19 @@ msgstr ""
 msgid "Update"
 msgstr "Listuppdatering"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Paket"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Förhandsvisning"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Problemlösaren"
 
@@ -3696,7 +3682,7 @@ msgid "Fix Manually"
 msgstr "Handbok"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Uppgradera"
 
@@ -4231,11 +4217,11 @@ msgstr "Installerat"
 msgid "Reinstall"
 msgstr "Installera om"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Nedgradera"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -4271,7 +4257,7 @@ msgstr "Aktivera ett filter på paketlistan"
 msgid "Download already running."
 msgstr "Hämtar..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 "En uppdatering av paketlistan eller en installationskörning sker just nu."
@@ -4333,38 +4319,38 @@ msgstr "Inga trasiga paket."
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Kunde inte ersätta %s med ny konfigurationsfil"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Hämtar paket"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "Inga trasiga paket."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "Inga trasiga paket."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "Lös beroenden"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Inga paket är trasiga."
 msgstr[1] "Inga paket är trasiga."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s ändrar"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s ändrar"
@@ -4372,7 +4358,7 @@ msgstr "%s ändrar"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4382,64 +4368,64 @@ msgstr[1] "%d att installera"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "misslyckades med att ta bort %s"
 msgstr[1] "misslyckades med att ta bort %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "HämtStorlek"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "inte installerat"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "Installerat"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "^Rensa"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Behåll"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "HÃ¥ll kvar"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "Användarhandbok"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4479,7 +4465,7 @@ msgstr "nej"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4524,17 +4510,17 @@ msgstr "%s; kommer att installeras automatiskt"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "Sök"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "Bygger vy"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Bygger vy"
@@ -5234,108 +5220,109 @@ msgstr "Okänd justeringstyp \"%s\""
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Sorteringspolicyn \"by-name\" tar inga argument"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Ogiltigt noll-längdsnamn för sorteringspolicy"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Omatchad \"(\" i sorteringspolicybeskrivning"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Ogiltig sorteringspolicytyp \"%s\""
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Kan inte avkoda flerbytesträng efter \"%ls\""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Kan inte avkoda bredteckensträng efter \"%s\""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s byggd den %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompilator: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Kompilerad mot:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt-version %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  NCurses-version: Okänd\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  NCurses-version: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++-version: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Stöd för Ept aktiverat.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Stöd för Ept avaktiverat.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt-version %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt-version %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Stöd för Ept avaktiverat.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s byggd den %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Stöd för Ept avaktiverat.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5343,32 +5330,32 @@ msgstr ""
 "\n"
 "Nuvarande version på bibliotek:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  NCurses-version: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  cwidget-version: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Apt-version: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Användning: aptitude [-S filnamn] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [flaggor] <åtgärd> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5377,42 +5364,42 @@ msgstr ""
 "  Åtgärder (om ingen anges kommer aptitude and gå in i interaktivt läge):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Installera/uppgradera paket.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Ta bort paket.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Rensa paket och deras konfigurationsfiler.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Ställ in paket till att hållas tillbaka.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Avbryt tillbakahållning av ett paket.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Markera paket som de vore automatiskt installerade.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Markera paket som de vore manuellt installerade.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5421,17 +5408,17 @@ msgstr ""
 " forbid-version - Förbjud aptitude att uppgradera till en specifik "
 "paketversion.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Hämta listor på nya/uppgraderingsbara paket.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Genomför en säker uppgradering.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5440,52 +5427,52 @@ msgstr ""
 " full-upgrade - Genomför en uppgradering och om möjligt installera och ta "
 "bort paket.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "\"&BD\" för att installera bygg-beroenden för ett paket."
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Glöm vilka paket som är \"nya\".\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Sök efter ett paket efter namn och/eller uttryck.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Visa detaljerad information om ett paket.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Visa detaljerad information om ett paket\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Radera hämtade paketfiler.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Radera gamla hämtade paketfiler.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Visa ändringsloggen för ett paket.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Hämta .deb-filen för ett paket.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5494,7 +5481,7 @@ msgstr ""
 " reinstall    - Hämta och (eventuellt) installera om ett för närvarande\n"
 "                installerat paket.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5507,7 +5494,7 @@ msgstr ""
 "aktuella paketet\n"
 
 # if I ever meet the person who choose this layout... /Martin
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5520,44 +5507,44 @@ msgstr ""
 "kan\n"
 "                skapa en konflikt med det givna paketet om det installeras.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Flaggor:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Denna hjälptext.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Denna hjälptext\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Simulera åtgärder utan att faktiskt genomföra dem.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -5565,18 +5552,18 @@ msgstr ""
 " -d             Hämta endast paket, installera inte eller ta bort "
 "någonting.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Fråga alltid efter bekräftelse eller åtgärder.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             Anta att svaret på enkla ja/nej-frågor är \"ja\".\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5584,54 +5571,54 @@ msgid ""
 msgstr ""
 " -F format      Ange ett format för visning av sökresultat; se manualen.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
 msgstr " -O sortering   Ange hur sökresultat ska sorteras; se manualen.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w bredd       Ange visningsbredd för att formatera sökresultat.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Försök aggressivt att rätta till trasiga paket.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Visa vilka versioner av paketen som ska installeras.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             Visa beroenden för automatiskt ändrade paket.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Visa ändring av installationsstorlek för varje paket.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
 msgstr " -v             Visa extra information. (kan anges flera gånger).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [utgåva]    Ange utgåvan för vilken paketen ska installeras.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5640,14 +5627,14 @@ msgstr ""
 " -q             I kommandoradsläge, tysta ner den inkrementella\n"
 "                förloppsindikatorn.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o nyckel=värde   Ställ direkt in en konfigurationsinställning med\n"
 "                   namnet \"nyckel\".\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5656,159 +5643,139 @@ msgstr ""
 " --with(out)-recommends\tFastställ huruvida rekommendationer ska behandlas\n"
 "                som starka beroenden.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S filnamn: Läs aptitudes utökade statusinformation från filnamn.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Hämta nya paketlistor vid uppstart.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             Denna hjälptext\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Genomför en installationskörning vid uppstart.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Denna aptitude har inte Super-Ko-Krafter.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 msgid "trace"
 msgstr "Sant"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 msgid "info"
 msgstr "nej"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 msgid "error"
 msgstr "Fel"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "Falskt"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Ogiltig åtgärd %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Förväntade ett nummer efter -q=\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Förväntade ett nummer efter -q=, fick %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o kräver ett argument i formatet nyckel=värde, fick %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Saknade komma efter etikettnamnet \"%s\".\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "SKUMT: okänd flaggkod mottagen\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "Paket"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "Alla paket"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5816,37 +5783,32 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Endast en av -u och -i får anges\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u och -i får inte anges i kommandoradsläget (exempelvis, med \"install\")"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u och -i får inte anges med ett kommando"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Okänt kommando \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Okänt kommando \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Ofångat undantag: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5864,7 +5826,7 @@ msgstr "Sök efter: "
 msgid "Search backwards for: "
 msgstr "Sök bakåt efter: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Minröj"
 
@@ -6074,7 +6036,7 @@ msgstr "UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 13 29 21 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Paket"
 
@@ -6155,8 +6117,8 @@ msgstr "-"
 msgid "<none>"
 msgstr "<ingen>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "virtuell"
@@ -6290,7 +6252,7 @@ msgstr "Kunde inte omkoda paketvisningsformatet efter \"%ls\""
 msgid "Internal error: Default column string is unparsable"
 msgstr "Internt fel: Standardkolumnsträng är inte tolkningsbar"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Funktioner"
 
@@ -6447,11 +6409,11 @@ msgstr "Matchindex måste vara 1 eller större, inte \"%s\""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "Matchindex %ls är för stort, tillgängliga grupper är (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "TAGGLÖSA PAKET"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6461,10 +6423,6 @@ msgstr ""
 " Dessa paket har ännu inte blivit klassificerade i debtags eller så saknas "
 "debtags-databasen (om du installerar debtags så kanske problemet löser sig)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "SAKNAR TAGG"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Källpaket: "
@@ -7089,7 +7047,7 @@ msgstr "Läser in cache"
 msgid "Really quit Aptitude?"
 msgstr "Verkligen avsluta Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Ändra hur aptitude fungerar"
 
@@ -7171,7 +7129,7 @@ msgstr ""
 msgid "License"
 msgstr "Licens"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 "Visa villkoren för kopiering och distribution som gäller för programmet"
@@ -7193,7 +7151,7 @@ msgstr "Direkthjälp"
 msgid "View a brief introduction to aptitude"
 msgstr "Visa en enkel introduktion till aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Hjälp"
 
@@ -7222,7 +7180,7 @@ msgstr "Handbok"
 msgid "FAQ"
 msgstr "Vanliga frågor"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Visa en lista med vanliga frågor med svar"
 
@@ -7264,15 +7222,15 @@ msgstr ""
 "ta bort denna katalog och dess innehåll? Om du väljer \"Nej\" kommer du inte "
 "få se detta meddelande igen."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Visa förloppet för pakethämtning"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Pakethämtning"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7284,35 +7242,35 @@ msgstr ""
 "på ditt system%b.  Du bör endast fortsätta med installationen om du är säker "
 "på att detta är det du vill göra. %n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [version %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Verkligen fortsätta"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Avbryt installation"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Förhandsgranska paketinstallationen"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Visa och/eller justera åtgärderna som ska genomföras"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Vissa paket var trasiga och har rättats till:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Ingen lösning till dessa beroendeproblem finns!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7321,7 +7279,7 @@ msgstr ""
 "Fick slut på tid under försöket att lösa beroendeproblemen (tryck \"%s\" för "
 "att försöka hårdare)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7329,20 +7287,20 @@ msgstr ""
 "Installation/borttagning av paket kräver administrativa rättigheter som du "
 "för närvarande inte har.  Vill du byta till root-kontot?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Bli root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Bli inte root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 "Inga paket är schemalagda för installation, borttagning eller uppgradering."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7352,19 +7310,19 @@ msgstr ""
 "kunde uppgraderas men du har inte valt att uppgradera dem. Tryck \"U\" för "
 "att förbereda en uppgradering."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Uppdaterar paketlistor"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Visa förloppet för uppdateringen av paketlistan"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Listuppdatering"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7372,23 +7330,23 @@ msgstr ""
 "Uppdatering av paketlistan kräver att du har administrativa rättigheter "
 "vilket du inte har för tillfället. Vill du byta till root-kontot?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Slösa bort tid med att leta minor"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Rensning under tiden en hämtning pågår är inte tillåtet"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Tar bort hämtade filer"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Hämtade paketfiler har tagits bort"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7397,11 +7355,11 @@ msgstr ""
 "Uppdatering av paketlistan kräver att du har administrativa rättigheter "
 "vilket du inte har för tillfället. Vill du byta till root-kontot?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "Cachefilen för apt är inte tillgänglig, kan inte rensa automatiskt."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7409,7 +7367,7 @@ msgid ""
 msgstr ""
 "Föråldrade hämtade paketfiler har tagits bort, frigjorde %sB diskplats."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7418,121 +7376,121 @@ msgstr ""
 "Uppdatering av paketlistan kräver att du har administrativa rättigheter "
 "vilket du inte har för tillfället. Vill du byta till root-kontot?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Inga fler lösningar."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Kunde inte hitta en lösning att verkställa."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Fick slut på tid under försöket att hitta en lösning."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Lös beroenden"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Sök efter lösningar för otillfredsställda beroenden"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Kunde inte öppna %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Fel vid dumpning av problemlösarens tillstånd"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Installera/Ta bort paket"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Uppdatera paketlista"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Markera upp^graderingsbar"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Glöm nya paket"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Avbry^t väntande åtgärder"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Rensa paketcachen"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Rensa föråldra^de filer"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Läs om paketcache"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Spela Minröj"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^Bli root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "A^vsluta"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Ã…ngra"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Installera"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Flagga det valda paketet för installation eller uppgradering"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Ta bort"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Flagga det valda paketet för borttagning"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Rensa"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "Flagga det valda paketet och dess konfigurationsfiler för borttagning"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Behåll"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Avbryt alla åtgärder för det valda paketet"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^HÃ¥ll kvar"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7540,11 +7498,11 @@ msgstr ""
 "Avbryt alla åtgärder för det valda paketet och skydda det från framtida "
 "uppgraderingar"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Markera ^automatiskt"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7552,11 +7510,11 @@ msgstr ""
 "Markera det valda paketet som om det har installerats automatiskt, det "
 "kommer automatiskt tas bort om inga andra paket är beroende av det"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Markera ^manuell"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7564,11 +7522,11 @@ msgstr ""
 "Markera det valda paketet som om det blivit manuellt installerat, det kommer "
 "inte att tas bort om inte du manuellt tar bort det"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Förbjud version"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7576,19 +7534,19 @@ msgstr ""
 "Förbjud den kandidatversionen av det valda paketet från att bli installerad, "
 "nyare versioner av paketet kommer att installeras som vanligt"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^nformation"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Visa ytterligare information om det valda paketet"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "Cirk^ulera paketinformation"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7598,59 +7556,59 @@ msgstr ""
 "beskrivning, en  summerad beskrivning av beroendestatusen eller en analys av "
 "varför paketet behövs."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Ändringslogg"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Visa Debians ändringslogg för det valda paketet"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "Und^ersök lösning"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Undersök den nuvarande valda lösningen till beroendeproblemen."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Genomför lö^sning"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Genomför åtgärderna som nuvarande lösning innebär."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Nästa lösning"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Välj nästa lösning till beroendeproblemen."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "Föregåe^nde lösning"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Välj föregående lösning till beroendeproblemen."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^Första lösningen"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Välj den första lösningen för beroendeproblemen."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "Sista ^lösningen"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
@@ -7658,35 +7616,35 @@ msgstr ""
 "Välj den sista lösningen för beroendeproblemen som än så länge har "
 "genererats."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Växla väg^rad"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Växla om den nuvarande valda åtgärden är icke godkänd."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Växl^a godkänd"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Växla om den nuvarande valda åtgärden är godkänd."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Visa mål"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Visa de paket som kommer att påverkas av den valda åtgärden"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Avvisa brott mot ^Hold"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7694,135 +7652,135 @@ msgstr ""
 "Avvisa alla åtgärder som skulle innebära förändringar på tillbakahållna "
 "paket eller kräva installation av förbjudna versioner"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Sök"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Sök framåt"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "Sök ^baklänges"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Sök bakåt"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Sök ^igen"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Upprepa senaste sökningen"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Sök igen ^baklänges"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Upprepa senaste sökningen i motstående riktning"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Begränsa visning"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Aktivera ett filter på paketlistan"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Ta bort begränsning"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Ta bort filtret från paketlistan"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Sök ^trasiga"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Hitta nästa paket med otillfredsställda beroenden"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^Egenskaper"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^Gränssnitt"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Ändra inställningar som påverkar användargränssnittet"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Beroendehantering"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Ändra inställningar som påverkar hur paketberoenden hanteras"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Diverse"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Ändra diverse programinställningar"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Återställ"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Återställ alla inställningar till systemets standard"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Nästa"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Visa nästa vy"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Föregående"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Visa föregående vy"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Stäng"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Stäng denna vy"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "^Vy för nya paket"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Skapa en ny standardpaketvy"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Granska ^rekommendationer"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7830,87 +7788,87 @@ msgstr ""
 "Visa paket som det rekommenderas att du installerar men som för närvarande "
 "inte är installerade."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Ny ^flat paketlista"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Visa alla paket på systemet i en okategoriserad lista"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Bläddra bland nya ^debtaggar"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Bläddra bland paket med Debtags-data"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "^Bläddra bland nya kategorier"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Bläddra bland paket efter kategori"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Om"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Visa information om detta program"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Hjälp"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Visa hjälp på nätet"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "Användar^handbok"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Visa den detaljerade programhandboken"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^Vanliga frågor"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Nyheter"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Visa de viktiga ändringarna som gjorts i varje version av "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Licens"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Åtgärder"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Sök"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Inställningar"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Vyer"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7919,11 +7877,11 @@ msgstr ""
 "%ls: Meny  %ls: Hjälp  %ls: Avsluta  %ls: Uppdatera  %ls: Hämta/Installera/"
 "Ta bort"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -7951,9 +7909,48 @@ msgstr "URL att använda för att hämta ändringsloggar"
 msgid "Downloading the changelog of %s"
 msgstr "Hämtar ändringslogg"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Du kan endast se ändringsloggar från officiella Debianpaket."
+#~ msgid "MISSING TAG"
+#~ msgstr "SAKNAR TAGG"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL att använda för att hämta ändringsloggar"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Det här alternativet styr utseendet på adressen för att hämta Debians "
+#~ "ändringsloggar. Du ska vanligen inte behöva ändra detta."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s är inte ett officiellt Debianpaket, kan inte visa dess ändringslogg."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Kunde inte hitta ett paket med namnet \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Kunde inte tolka mönstret %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Förväntade ett nummer efter -q=\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Förväntade ett nummer efter -q=, fick %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o kräver ett argument i formatet nyckel=värde, fick %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "SKUMT: okänd flaggkod mottagen\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u och -i får inte anges med ett kommando"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Du kan endast se ändringsloggar från officiella Debianpaket."
 
 #~ msgid "Err "
 #~ msgstr "Fel"
@@ -8124,11 +8121,6 @@ msgstr "Du kan endast se ändringsloggar från officiella Debianpaket."
 #~ msgstr "Hämtar ändringslogg"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Ingen lösning hittades."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Kunde inte öppna pakethierarkifilen %s"
diff --git a/po/th.gmo b/po/th.gmo
index 44bceab3..fee7f2cd 100644
--- a/po/th.gmo
+++ b/po/th.gmo
diff --git a/po/th.po b/po/th.po
index da7cfe89..8c67bdbb 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: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\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"
@@ -302,66 +302,55 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr ""
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr ""
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -369,11 +358,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr ""
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -381,11 +370,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr ""
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -393,11 +382,11 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -405,11 +394,11 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr ""
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -420,11 +409,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr ""
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -435,22 +424,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -463,15 +452,15 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr ""
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr ""
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr ""
 
@@ -575,117 +564,115 @@ msgstr ""
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already installed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already going to be installed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, 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:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr ""
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
 "      virtual package \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr ""
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, 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:560
+#: src/cmdline/cmdline_action.cc:555
 #, 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:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -699,7 +686,7 @@ msgid ""
 "packages contain \"%s\" in their description:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr ""
@@ -722,28 +709,22 @@ msgstr "ปั�หา "
 msgid "Changelog download failed: %s"
 msgstr ""
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr ""
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, c-format
 msgid "Couldn't run pager %s"
 msgstr ""
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
+msgid "The clean command takes no arguments"
 msgstr ""
 
 #: src/cmdline/cmdline_clean.cc:66
@@ -751,68 +732,59 @@ msgstr ""
 msgid "Del %s* %spartial/*\n"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "ไม่รู้จั�คำสั่ง %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
+msgid "download: you must specify at least one package to download"
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr ""
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr ""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -849,30 +821,21 @@ msgid "[Working]"
 msgstr " [�ำลังทำงาน]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr ""
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
+msgid "The forget-new command takes no arguments"
 msgstr ""
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr ""
@@ -979,33 +942,33 @@ msgstr "จะปรับรุ่น�พ�เ�จต่อไปนี้
 msgid "The following partially installed packages will be configured:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, 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:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1016,14 +979,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  %s::CmdLine::Ignore-Trust-Violations is 'true'!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1034,7 +997,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1043,199 +1006,199 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "ติดตั้งซ้ำ %lu, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "ปรับรุ่นลง %lu, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "ถอดถอน %lu �ละไม่ปรับรุ่น %lu\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1243,45 +1206,45 @@ msgid ""
 "The following actions are available:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1289,52 +1252,52 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 msgid "'a': the package was automatically installed or removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1342,7 +1305,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1350,7 +1313,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1358,7 +1321,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1366,7 +1329,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1374,7 +1337,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1494,6 +1457,11 @@ msgstr ""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr ""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr ""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1640,7 +1608,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1668,7 +1636,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr ""
 
@@ -1698,7 +1666,7 @@ msgid ""
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1707,23 +1675,22 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
+msgid "iconv of %s failed"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
 msgstr ""
 
 #: src/cmdline/cmdline_show_broken.cc:81
@@ -1767,7 +1734,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr ""
@@ -1990,7 +1957,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr ""
 
@@ -2004,15 +1971,9 @@ msgstr ""
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "ไม่พบ�พ�เ�จ %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr ""
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "ไม่พบ�พ�เ�จ"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2023,13 +1984,12 @@ msgstr ""
 msgid "Internal Error, Ordering didn't finish"
 msgstr ""
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr ""
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
+msgid "The update command takes no arguments"
 msgstr ""
 
 #: src/cmdline/cmdline_user_tag.cc:65
@@ -2047,132 +2007,154 @@ msgstr ""
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
-#, c-format
-msgid "No candidate version found for %s\n"
-msgstr ""
-
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No current or candidate version found for %s\n"
+msgid "No candidate version found for %s"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
+msgid "No current or candidate version found for %s"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:203
-#, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr ""
+#: src/cmdline/cmdline_util.cc:202
+#, fuzzy, c-format
+#| msgid "Unable to locate package %s"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "ไม่พบ�พ�เ�จ %s"
 
-#: src/cmdline/cmdline_util.cc:209
-#, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr ""
+#: src/cmdline/cmdline_util.cc:213
+#, fuzzy, c-format
+#| msgid "Unable to locate package %s"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "ไม่พบ�พ�เ�จ %s"
 
-#: src/cmdline/cmdline_util.cc:239
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:273
-#, c-format
-msgid "Couldn't find task '%s'"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "ไม่พบ�พ�เ�จ %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:966
+#, c-format
+msgid "Couldn't find any package for pattern '%s'"
+msgstr ""
+
+#: src/cmdline/cmdline_versions.cc:126
 #, c-format
 msgid "Package %s:"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "�ำลังถอดถอน %s"
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, c-format
 msgid "Archive %s:"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+msgid "versions: You must provide at least one package selector"
 msgstr ""
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2195,7 +2177,7 @@ msgstr ""
 msgid "Candidate"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr ""
 
@@ -2297,20 +2279,18 @@ msgstr ""
 msgid "Packages requiring %s:"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 
 #: src/cmdline/cmdline_why.h:212
@@ -2337,11 +2317,11 @@ msgstr ""
 msgid "UNAVAILABLE"
 msgstr ""
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr ""
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr ""
 
@@ -2537,31 +2517,31 @@ msgid ""
 "you make to the states of packages will NOT be preserved!"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2628,34 +2608,42 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"ดาวน์โหลดบาง�พ�เ�จไม่สำเร็จ บางที �ารเรีย� aptitude update หรือลองใช้ตัวเลือ� --fix-"
+"missing อาจช่วยได้"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2798,13 +2786,13 @@ msgid ""
 "Log complete.\n"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "จะ *ลบ* �พ�เ�จต่อไปนี้:"
@@ -2911,18 +2899,18 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "�ฟ้มดัชนี�พ�เ�จเสียหาย ไม่มีข้อมูล Filename: (ชื่อ�ฟ้ม) สำหรับ�พ�เ�จ %s"
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr ""
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "ไม่พบ�พ�เ�จ %s"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "ไม่พบ�พ�เ�จ %s"
@@ -2971,25 +2959,26 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "ไม่พบ�พ�เ�จ %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr ""
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 msgid "No tag descriptions are available."
 msgstr ""
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, c-format
 msgid "No description available for %s."
 msgstr ""
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3133,43 +3122,43 @@ msgstr ""
 msgid "_File"
 msgstr ""
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 msgid "Restart the program as root; your settings will be preserved"
 msgstr ""
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr ""
 
@@ -3177,7 +3166,7 @@ msgstr ""
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
@@ -3208,7 +3197,7 @@ msgid "_Help"
 msgstr ""
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3216,19 +3205,19 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr ""
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr ""
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr ""
 
@@ -3397,7 +3386,7 @@ msgid "Fix Manually"
 msgstr ""
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr ""
 
@@ -3905,11 +3894,11 @@ msgstr ""
 msgid "Reinstall"
 msgstr ""
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr ""
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr ""
 
@@ -3941,7 +3930,7 @@ msgstr ""
 msgid "Download already running."
 msgstr ""
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr ""
 
@@ -4000,41 +3989,41 @@ msgstr ""
 msgid "Asking whether to replace the configuration file %s"
 msgstr ""
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr ""
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr ""
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr ""
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr ""
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr ""
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr ""
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4044,61 +4033,61 @@ msgstr[1] ""
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr ""
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "ติดตั้งซ้ำ %lu, "
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr ""
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr ""
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr ""
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr ""
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr ""
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4133,7 +4122,7 @@ msgstr ""
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4177,15 +4166,15 @@ msgstr ""
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr ""
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr ""
@@ -4834,257 +4823,258 @@ msgstr ""
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr ""
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr ""
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr ""
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr ""
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr ""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr ""
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr ""
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr ""
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr ""
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr ""
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr ""
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr ""
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr ""
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr ""
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
 msgstr ""
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr ""
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr ""
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr ""
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr ""
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr ""
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr ""
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, fuzzy, c-format
 msgid " remove       - Remove packages.\n"
 msgstr "�ำลังถอดถอน %s"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr ""
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr ""
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr ""
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr ""
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr ""
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
 msgstr ""
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr ""
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr ""
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr ""
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr ""
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr ""
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr ""
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr ""
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr ""
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
 msgstr ""
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5092,7 +5082,7 @@ msgid ""
 "                why one or more packages would require the given package.\n"
 msgstr ""
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5101,281 +5091,261 @@ msgid ""
 "                lead to a conflict with the given package if installed.\n"
 msgstr ""
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr ""
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr ""
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr ""
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr ""
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr ""
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
 msgstr ""
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
 msgstr ""
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr ""
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
 msgstr ""
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr ""
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies.\n"
 msgstr ""
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr ""
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr ""
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr ""
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 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:393
+#: src/main.cc:359
 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:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 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:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 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:408
+#: src/main.cc:374
 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:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "ไม่รู้จั�คำสั่ง %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr ""
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr ""
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr ""
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr ""
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 msgid "first-package"
 msgstr ""
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 msgid "all-packages"
 msgstr ""
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5383,33 +5353,29 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr ""
 
-#: src/main.cc:1088
+#: src/main.cc:837
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
-msgstr ""
-
-#: src/main.cc:1105
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
+msgid "Unknown command \"%s\""
 msgstr ""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr ""
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5425,7 +5391,7 @@ msgstr ""
 msgid "Search backwards for: "
 msgstr ""
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr ""
 
@@ -5633,7 +5599,7 @@ msgstr ""
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr ""
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr ""
 
@@ -5714,8 +5680,8 @@ msgstr ""
 msgid "<none>"
 msgstr ""
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr ""
@@ -5849,7 +5815,7 @@ msgstr ""
 msgid "Internal error: Default column string is unparsable"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr ""
 
@@ -5975,21 +5941,17 @@ msgstr ""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr ""
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr ""
@@ -6555,7 +6517,7 @@ msgstr ""
 msgid "Really quit Aptitude?"
 msgstr ""
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -6631,7 +6593,7 @@ msgstr ""
 msgid "License"
 msgstr ""
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 
@@ -6652,7 +6614,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr ""
 
@@ -6681,7 +6643,7 @@ msgstr ""
 msgid "FAQ"
 msgstr ""
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr ""
 
@@ -6716,15 +6678,15 @@ msgid ""
 "not see this message again."
 msgstr ""
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr ""
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr ""
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -6732,610 +6694,610 @@ msgid ""
 "what you want to do.%n%n"
 msgstr ""
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr ""
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr ""
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr ""
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr ""
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr ""
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr ""
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr ""
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr ""
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr ""
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr ""
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr ""
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr ""
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr ""
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 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:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr ""
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr ""
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr ""
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr ""
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr ""
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr ""
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr ""
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr ""
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr ""
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr ""
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr ""
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr ""
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr ""
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr ""
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr ""
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 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:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr ""
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 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:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr ""
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr ""
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr ""
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr ""
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr ""
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr ""
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr ""
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr ""
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr ""
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr ""
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr ""
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr ""
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr ""
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr ""
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr ""
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr ""
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr ""
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr ""
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr ""
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr ""
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr ""
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr ""
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr ""
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr ""
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr ""
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr ""
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr ""
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr ""
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr ""
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr ""
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr ""
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr ""
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr ""
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr ""
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr ""
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr ""
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr ""
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr ""
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr ""
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr ""
 
@@ -7363,10 +7325,6 @@ msgstr "ไม่พบ�พ�เ�จ %s"
 msgid "Downloading the changelog of %s"
 msgstr "ไม่พบ�พ�เ�จ %s"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr ""
-
 #~ msgid "Err "
 #~ msgstr "ปั�หา "
 
diff --git a/po/tl.gmo b/po/tl.gmo
index 1eafdadb..87e80a2f 100644
--- a/po/tl.gmo
+++ b/po/tl.gmo
diff --git a/po/tl.po b/po/tl.po
index 292a1d60..c44fa64d 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-05-23 11:47+0800\n"
 "Last-Translator: Ryan Escarez <rescarez@gmail.com>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -317,70 +317,59 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL na gamitin upang kunin ang mga changelog"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Ipakita muna ang mga balak gawin bago ito gawin"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 "Kalimutan kung ang pakete ay \"bago\" kapag na-apdeyt ang talaan ng pakete"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Kalimutan kung ang pakete ay \"bago\" kapag nag-install o nag-tangal ng "
 "pakete"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Magbigay babala kapag sinubukang gumawa ng pribilehiyong gawa na hindi root"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -388,11 +377,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Tipunan na talaan ng mga ginawa"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -400,11 +389,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Awtomatikong ayusin ang mga dependensi ng pakete kapag pinili"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -412,12 +401,12 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Awtomatikong ayusin ang mga sirang pakete bago mag-install o mag-tanggal"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -425,12 +414,12 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 #, fuzzy
 msgid "Install recommended packages automatically"
 msgstr "Mag-install ng Rekomendadong mga pakete ng awtomatiko"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -441,11 +430,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Tanggalin ang di ginagamit na mga pakete ng awtomatiko"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -456,22 +445,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -484,17 +473,17 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 #, fuzzy
 msgid "UI options"
 msgstr "^UI options"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 #, fuzzy
 msgid "Dependency handling"
 msgstr "^Dependency na pag-tagan"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Samut-samot"
 
@@ -600,7 +589,7 @@ msgstr "Hindi makita ang arkibo \"%s\" para sa pakete \"%s\"\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -609,7 +598,7 @@ msgstr ""
 "Paunawa: \"%s\", nagbibigay ng bertwal na pakete\n"
 "         \"%s\", ay naka-install na.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -618,7 +607,7 @@ msgstr ""
 "Paunawa: \"%s\", nagbibigay ng bertwal na pakete\n"
 "         \"%s\", ay iinstolahin na.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -627,17 +616,23 @@ msgstr ""
 "\"%s\" ay nasa talaan ng mga pakete, ngunit hindi ito\n"
 "totoong pakete at walang pakete na nagbibigay nito.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" ay paketeng bertwal na binibigay ng:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Kailangan niyong pumili ng isa na iinstolahin.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "Hindi naka-instol ang paketeng %s, hindi mapagbawal ang apgreyd\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -646,64 +641,57 @@ msgstr ""
 "Paunawa: pinili ang \"%s\" sa halip ng\n"
 "         bertwal na paketeng \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s ay naka-instoll na sa hiniling na bersyon (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr ""
 "%s ay kasalukuyan hindi pa naka-instol, kaya hindi ito iinstolin muli.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s ay naka-instoll na sa hiniling na bersyon (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 "%s ay kasalukuyan hindi pa naka-instol, kaya hindi ito iinstolin muli.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Hindi naka-instol ang paketeng %s, kaya hindi ito tatanggalin\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Hindi naka-instol ang paketeng %s, hindi mapagbawal ang apgreyd\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Hindi maaaring i-apgreyd ang %s, hindi mapagbawal ang apgreyd\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Paunawa: pinili na instolahin ang task \"%s: %s\"\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, fuzzy, c-format
+#: src/cmdline/cmdline_action.cc:501
+#, fuzzy
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Maari lamang itukoy ang bersyon ng pakete gamit ang utos na 'install'.\n"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr ""
-"Maaari lamang itukoy ang arkibo ng pakete gamit ang utos na 'install'.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Maaari lamang itukoy ang arkibo ng pakete gamit ang utos na 'install'"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -712,7 +700,7 @@ msgstr ""
 "Hindi mahanap ang paketeng \"%s\", at higit sa 40\n"
 "na pakete ang may \"%s\" sa kanilang pangalan.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -721,13 +709,13 @@ msgstr ""
 "Hindi mahanap ang paketeng \"%s\". Gayunpaman, ang sumusunod\n"
 "na mga pakete ay may \"%s\" sa kanilang pangalan:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "Hindi makahanap ng pakete na kapareha ang pangalan o paglalarawan sa \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -746,7 +734,7 @@ msgstr ""
 "Hindi nakahanap ng pakete na kapareha ng \"%s\".  Subalit, ang mga\n"
 "susunod na mga pakete ay may \"%s\" sa kanilang paglalarawan:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Di tanggap na utos '%c'\n"
@@ -769,30 +757,24 @@ msgstr "Err "
 msgid "Changelog download failed: %s"
 msgstr "ChangeLog ng %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "Hindi mapatakbo ng sensible-pager, ito ba'y umaandar na sistemang Debian?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"Hindi opisyal na pakete ng Debian ang %s, hindi maipakita ang changelog nito."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Hindi mahanap ang changelog ng %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "Hindi mahanap ang changelog ng %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, fuzzy, c-format
-msgid "E: The clean command takes no arguments\n"
+#, fuzzy
+msgid "The clean command takes no arguments"
 msgstr "E: Ang update command ay kulang sa argumento\n"
 
 #: src/cmdline/cmdline_clean.cc:66
@@ -800,70 +782,63 @@ msgstr "E: Ang update command ay kulang sa argumento\n"
 msgid "Del %s* %spartial/*\n"
 msgstr "Burahin %s*.%spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr ""
 
-#: src/cmdline/cmdline_clean.cc:134
-#, fuzzy, c-format
-msgid "E: The autoclean command takes no arguments\n"
+#: src/cmdline/cmdline_clean.cc:127
+#, fuzzy
+msgid "The autoclean command takes no arguments"
 msgstr "E: Ang update command ay kulang sa argumento\n"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, fuzzy, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Maka libre ng %sB ang disk space"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, fuzzy, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Maka libre ng %sB ang disk space"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Hindi tanggap na operasyon %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, fuzzy, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+#, fuzzy
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Hintuin.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
+msgid "download: you must specify at least one package to download"
 msgstr ""
-"kumuha: kailangan niyong magbigay ng di kukulang sa isang pakete na kukunin\n"
+"kumuha: kailangan niyong magbigay ng di kukulang sa isang pakete na kukunin"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Hindi mabasa ang talaan ng pagkukunan (source list)"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Hindi mahanap ang paketeng nagngangalang \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -904,30 +879,22 @@ msgid "[Working]"
 msgstr " [Nagtatrabaho]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, fuzzy, c-format
-msgid "No such package \"%s\""
-msgstr "Pinanggalingan ng pakete: "
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, fuzzy, c-format
-msgid "E: The forget-new command takes no arguments\n"
+#, fuzzy
+msgid "The forget-new command takes no arguments"
 msgstr "E: Ang update command ay kulang sa argumento\n"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Kakalimutan kung anong mga bagong pakete\n"
@@ -1037,17 +1004,17 @@ msgstr "Ang mga sumusunod na mga pakete ay ia-apgreyd:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Ang mga sumusunod na mga pakete ay ia-apgreyd:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Ang sumusunod na mga paketeng ESENSIYAL ay TATANGGALIN!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Ang sumusunod na mga paketeng ESENSIYAL ay MASISIRA nitong gagawin:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1056,16 +1023,16 @@ msgstr ""
 "BABALA: Ang gagawing ito ay maaaring makasira sa inyong sistema!\n"
 "        HUWAG magpatuloy kung di niyo alam ng TIYAK ang inyong ginagawa!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Alam ko na ito'y masamang ideya"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Upang magpatuloy, ibigay ang pariralang \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1083,14 +1050,14 @@ msgstr ""
 "ito.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  %s::CmdLine::Ignore-Trust-Violations is 'true'!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1101,7 +1068,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1110,203 +1077,203 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Nais ba ninyong di pansinin ang babalang ito at magpatuloy pa rin?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr ""
 "Upang magpatuloy, ibigay ang pariralang \"%s\"; upang huminto, ibigay ang "
 "\"%s\": "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Di kilalang input.  Ipasok ang \"%s\" o \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Ang sumusunod na mga pakete ay REKOMENDADO pero HINDI iluluklok:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Ang sumusunod na mga pakete ay MINUMUNGKAHI pero HINDI iluluklok:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Walang paketeng iinstolahin, iaapgreyd, o tatanggalin.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu na paketeng inapgreyd, %lu bagong luklok, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu iniluklok muli, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu dinawngreyd, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu na tatanggalin at %lu hindi inapgreyd.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Kailangang kumuha ng %sB/%sB ng arkibo. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Kailangan kumuha ng %sB ng arkibo. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Matapos magbuklat ay %sB ay gagamitin.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Matapos magbuklat ay %sB ay mapapalaya.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "Walang paketeng ipapakita - ibigay ang mga pakete pagkatapos ng 'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Pindutin ang Enter upang tumuloy."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Walang nahanap na mga pakete -- ibigay ang mga pakete pagkatapos ng 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 #, fuzzy
 msgid "toggle the display of changes in package sizes"
 msgstr "Ang anyo ng ipapakita para sa pagtanaw ng mga pakete"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1314,52 +1281,52 @@ msgid ""
 "The following actions are available:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 #, fuzzy
 msgid "'+' to install packages"
 msgstr "^Iluklok/tanggalin ang mga pakete"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 #, fuzzy
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr "Ang mga sumusunod na BAGONG mga pakete ay awtomatikong iinstolahin:"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 #, fuzzy
 msgid "'-' to remove packages"
 msgstr "^Iluklok/tanggalin ang mga pakete"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 #, fuzzy
 msgid "'_' to purge packages"
 msgstr "^Kalimutan ang mga bagong pakete"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 #, fuzzy
 msgid "'=' to place packages on hold"
 msgstr " hold         - ilagay ang pakete sa pag kakahawak\n"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 #, fuzzy
 msgid "'&M' to mark packages as automatically installed"
 msgstr " markahanlagi     - Markahan ang pakete para kusang mag instal\n"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 #, fuzzy
 msgid "'&m' to mark packages as manually installed"
 msgstr " alisin-ang-marka-lagi   - Markahan ang pakete para i-manual instal\n"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1367,55 +1334,55 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr " markahanlagi     - Markahan ang pakete para kusang mag instal\n"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 #, fuzzy
 msgid "Commands:"
 msgstr "rekomedasyon"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Nais niyo bang magpatuloy? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Di tanggap na sagot.  Pakibigay ng tanggap na utos o '?' para sa tulong.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1426,7 +1393,7 @@ msgstr ""
 "Ipapakita ang impormasyong dependency.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1437,7 +1404,7 @@ msgstr ""
 "Hindi ipapakita ang impormasyong dependency.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1448,7 +1415,7 @@ msgstr ""
 "Ipapakita ang mga bersyon.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1459,7 +1426,7 @@ msgstr ""
 "Hindi ipapakita ang mga bersyon.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1470,7 +1437,7 @@ msgstr ""
 "Ipapakita ang mga pagbabago sa laki.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1596,6 +1563,11 @@ msgstr ""
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, fuzzy, c-format
+msgid "No such package \"%s\""
+msgstr "Pinanggalingan ng pakete: "
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1742,7 +1714,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 #, fuzzy
@@ -1773,7 +1745,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Ang mga sumusunod na pakete ay SIRA:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr ""
 
@@ -1807,7 +1779,7 @@ msgid ""
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1816,26 +1788,25 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
+msgid "iconv of %s failed"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
 msgstr ""
-"paghanap: Dapat magbigay kayo ng di kukulang sa isang terminong hahanapin\n"
+"paghanap: Dapat magbigay kayo ng di kukulang sa isang terminong hahanapin"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1878,7 +1849,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Ang mga sumusunod na pakete ay may kulang na dependensiya:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr ""
@@ -2101,7 +2072,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Provides"
 
@@ -2115,15 +2086,9 @@ msgstr "Diskripyson: "
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:582
-#, fuzzy, c-format
-msgid "Unable to locate package %s"
-msgstr "Hindi ma-buksan ang %s para sulatan"
-
-#: src/cmdline/cmdline_show.cc:603
-#, fuzzy, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Hindi ma-buksan ang %s para sulatan"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Walang nahanap na mga pakete"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2134,14 +2099,13 @@ msgstr "Would /download/install/remove ang pakete.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Internal Error, Ordering ay hindi natapos"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Binubura ang matagal ng nakuhang mga files"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: Ang update command ay kulang sa argumento\n"
+msgid "The update command takes no arguments"
+msgstr "Ang update command ay kulang sa argumento"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, fuzzy, c-format
@@ -2158,133 +2122,155 @@ msgstr "Hindi makita ang version \"%s\" para sa pakete \"%s\"\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Walang kandidatong version na nakita %s\n"
+msgid "No candidate version found for %s"
+msgstr "Walang kandidatong version na nakita %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, fuzzy, c-format
-msgid "No current or candidate version found for %s\n"
+msgid "No current or candidate version found for %s"
 msgstr "Walang kandidatong version na nakita %s\n"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Hindi makita ang arkibo \"%s\" para sa pakete \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Hindi makita ang arkibo \"%s\" para sa pakete \"%s\""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Hindi makita ang version \"%s\" para sa pakete \"%s\"\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Hindi makita ang version \"%s\" para sa pakete \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "Internal error: maling value %i na dumaan cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "Internal error: maling value %i na dumaan cmdline_find_ver!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
 msgstr ""
-"Hindi mo pwedeng specify ang dalawang arkibo at ang version para sa pakete\n"
+"Hindi mo pwedeng specify ang dalawang arkibo at ang version para sa pakete"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Hindi mahanap ang changelog ng %s"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, fuzzy, c-format
+msgid "Unable to locate package %s"
+msgstr "Hindi ma-buksan ang %s para sulatan"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Hindi mahanap ang changelog ng %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Paunawa: pinili na instolahin ang task \"%s: %s\"\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Hindi mahanap ang changelog ng %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Mga Pakete"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Pinanggalingan ng pakete: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "Arkibo"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr ""
 "paghanap: Dapat magbigay kayo ng di kukulang sa isang terminong hahanapin\n"
 
@@ -2311,7 +2297,7 @@ msgstr ""
 msgid "Candidate"
 msgstr "CandVer"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 #, fuzzy
 msgid "Install"
 msgstr "^Instal"
@@ -2416,21 +2402,19 @@ msgstr "Hindi makita ang version \"%s\" para sa pakete \"%s\"\n"
 msgid "Packages requiring %s:"
 msgstr "Pakete na umaasa sa %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, fuzzy, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Hindi mahanap ang paketeng nagngangalang \"%s\""
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 #, fuzzy
 msgid "Unable to parse some match patterns."
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 
 #: src/cmdline/cmdline_why.h:212
@@ -2457,12 +2441,12 @@ msgstr "HINDI KUNTENTO"
 msgid "UNAVAILABLE"
 msgstr "HINDI AVAILABLE"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 #, fuzzy
 msgid "Tags"
 msgstr "Tag"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 #, fuzzy
 msgid "User Tags"
 msgstr "Tag"
@@ -2664,31 +2648,31 @@ msgid ""
 "you make to the states of packages will NOT be preserved!"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "main"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2755,37 +2739,45 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Internal error: hindi ma-generate ang listahan ng paketeng kukunin"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, fuzzy, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"Hindi nakuha ang ilang mga arkibo, maaaring patakbuhin ang aptitude update o "
+"subukang may --fix-missing?"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Hindi ma i-ayos dahil sa hindi available na pakete"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 #, fuzzy
 msgid "A package failed to install.  Trying to recover:"
 msgstr ""
 "Ayyyk!!!  Mayhindi magandang nanyari habang ini-install ang mga pakete.  "
 "Sinusubukang ma-recover:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2938,13 +2930,13 @@ msgstr ""
 "\n"
 "Log ay tapos na.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "Kinukuha ang mga pakete"
@@ -3055,18 +3047,18 @@ msgid ""
 msgstr ""
 "Ang pakete index files ay sira. Walang Filename: field para sa pakete %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Changelog ng %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "URL na gamitin upang kunin ang mga changelog"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL na gamitin upang kunin ang mga changelog"
@@ -3116,26 +3108,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr ""
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "hindi naka-instol"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "hindi naka-instol"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3284,41 +3277,41 @@ msgstr ""
 msgid "_File"
 msgstr "^Isara"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Gawin ang lahat ng naka-binbin na instal at mga tatanggalin"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Suriin para sa mga bagong bersyon ng mga pakete"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Markahan ang lahat ng hindi upgradable na pakete na hindi kasama sa upgrade"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Kalimutan kung ano amg mga pakete na \"bago\""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 #, fuzzy
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "Gawin ang lahat ng naka-binbin na instal at mga tatanggalin"
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Burahin ang pakete files na na-download ng nakaraan"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Alisin ang pakete files na hindi na ma-download"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Reload ang pakete cache"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 msgid "Restart the program as root; your settings will be preserved"
 msgstr ""
@@ -3326,7 +3319,7 @@ msgstr ""
 "iyong\n"
 "settings ay hindi magagalaw"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Lumabas sa programa"
 
@@ -3334,7 +3327,7 @@ msgstr "Lumabas sa programa"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Ulitin ang huling pakete operation o grupo ng operations"
 
@@ -3368,7 +3361,7 @@ msgid "_Help"
 msgstr "Tulong"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3377,20 +3370,20 @@ msgstr ""
 msgid "Update"
 msgstr "Markahan ng ^Upgradable"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Mga Pakete"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 #, fuzzy
 msgid "Preview"
 msgstr "^Nakaraan"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 #, fuzzy
 msgid "Resolver"
 msgstr "^Tanggalin"
@@ -3575,7 +3568,7 @@ msgid "Fix Manually"
 msgstr "Markahang ^Manual"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 #, fuzzy
 msgid "Upgrade"
 msgstr "upgrade"
@@ -4114,12 +4107,12 @@ msgstr "naka-instol"
 msgid "Reinstall"
 msgstr "reinstall"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 #, fuzzy
 msgid "Downgrade"
 msgstr "downgrade"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 #, fuzzy
 msgid "Remove"
 msgstr "^Tanggalin"
@@ -4156,7 +4149,7 @@ msgstr "Apply ang filter sa listahan ng mga pakete"
 msgid "Download already running."
 msgstr "Kinukuha..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Ang package-list update o install run ay kasalukuyan nasa pwesto."
 
@@ -4217,38 +4210,38 @@ msgstr "^Iluklok/tanggalin ang mga pakete"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Hindi ma-palitan ang %s ng bagong configuration file"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Kinukuha ang mga pakete"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "^Iluklok/tanggalin ang mga pakete"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "^Iluklok/tanggalin ang mga pakete"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "May mga pakete na basag.  Subukin na ayusin sila?"
 msgstr[1] "May mga pakete na basag.  Subukin na ayusin sila?"
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "^Tanaw ng Bagong mga Pakete"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "Lahat ng pakete"
@@ -4256,7 +4249,7 @@ msgstr "Lahat ng pakete"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4266,66 +4259,66 @@ msgstr[1] "Instal"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "Hindi ma-buksan ang %s para sulatan"
 msgstr[1] "Hindi ma-buksan ang %s para sulatan"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "DownloadSize"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "hindi naka-instol"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "naka-instol"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "^Purge"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 #, fuzzy
 msgid "Keep"
 msgstr "^Itago"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 #, fuzzy
 msgid "Hold"
 msgstr "^Pigilin"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "^Manwal ng Pag-gamit"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4363,7 +4356,7 @@ msgstr "hindi"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4408,17 +4401,17 @@ msgstr "%s; iinstolahin ang bersyon %s ng kusa"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "Paghahanap"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "Gumagawa ng view"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Gumagawa ng view"
@@ -5134,117 +5127,118 @@ msgstr "Di-kilalang anyo ng pagkakahanay '%s'"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Ayon sa pangalan pag-uri-uriing patakaran ay walang nakuhang argumento"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Di-valid na sero-haba sa pag-uri-uriing na pangalan ng patakaran"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Hindi bagay '(' sa pag-uri-uriin na mga paglalarawan ng patakaran"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Di-valid na pag-uri-uriin na anyo ng patakaran '%s'"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr ""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s compiled sa %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Compiler: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 #, fuzzy
 msgid "Compiled against:\n"
 msgstr "Compiler: g++ %s\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr ""
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, fuzzy, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 "\n"
 "NSalin ng tungayaw: %s\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, fuzzy, c-format
 msgid "  NCurses version %s\n"
 msgstr ""
 "\n"
 "NSalin ng tungayaw: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, fuzzy, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "libsigc++ salin: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr ""
 "\n"
 "Salin ng tingayaw: %s\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr ""
 "\n"
 "Salin ng tingayaw: %s\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s compiled sa %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:181
 #, fuzzy
 msgid ""
 "\n"
@@ -5253,36 +5247,36 @@ msgstr ""
 "\n"
 "Salin ng tingayaw: %s\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, fuzzy, c-format
 msgid "  NCurses version: %s\n"
 msgstr ""
 "\n"
 "NSalin ng tungayaw: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, fuzzy, c-format
 msgid "  cwidget version: %s\n"
 msgstr "libsigc++ salin: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, fuzzy, c-format
 msgid "  Apt version: %s\n"
 msgstr ""
 "\n"
 "Salin ng tingayaw: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Pag-gamit: aptitude [-S fname] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [mga option] <aksyon> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5292,43 +5286,43 @@ msgstr ""
 "pamamaraan):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, fuzzy, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Install/upgrade ang mga pakete\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, fuzzy, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Alisin ang pakete\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, fuzzy, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr ""
 " purge        - Alisin ang pakete at ang kanilang configuration files\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, fuzzy, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - ilagay ang pakete sa pag kakahawak\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, fuzzy, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Tanggalin ang pagkakawak sa pakete\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, fuzzy, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markahanlagi     - Markahan ang pakete para kusang mag instal\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, fuzzy, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " alisin-ang-marka-lagi   - Markahan ang pakete para i-manual instal\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5337,17 +5331,17 @@ msgstr ""
 " forbid-version - Ipinagbawal ng aptitude mula upgrading sa partikular na "
 "paketeng salin.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, fuzzy, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Listahan ng na-kuha na bago/upgradable pakete\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, fuzzy, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " upgrade      - Gawin ang safe na upgrade\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, fuzzy, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5356,59 +5350,59 @@ msgstr ""
 " dist-upgrade - Magsagawa ng upgrade, marahil installing at alisin ang mga "
 "pakete\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, fuzzy, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Limutin kung ano ang mga pakete na  \"bago\"\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, fuzzy, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Hanapin ang pakete sa pangalan at/o expression\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, fuzzy, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Pakita ang detalyadong impormasyon tungkol sa pakete\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Pakita ang detalyadong impormasyon tungkol sa pakete\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, fuzzy, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Burahin ang nakuhang pakete files\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, fuzzy, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Burahin ang lumang nakuhang pakete files\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, fuzzy, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Tingnan ang changelog ng pakete\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, fuzzy, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Kuhain ang .deb file para sa pakete\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
 msgstr ""
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, fuzzy, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5417,7 +5411,7 @@ msgid ""
 msgstr ""
 " -Z\t\t    Ipakita ang pagbabago sa installed na sukat ng bawat pakete.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, fuzzy, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5427,46 +5421,46 @@ msgid ""
 msgstr ""
 " -Z\t\t    Ipakita ang pagbabago sa installed na sukat ng bawat pakete.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Options:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, fuzzy, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Ang tulong na ito\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Ang tulong na ito\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 " -s             Magsagawa ng kunwaring aksyon, pero wag gawin ng toto ang "
 "pagsagawa sa kanila.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -5474,12 +5468,12 @@ msgstr ""
 " -d             Kunin ang pakete lamang, wag i-instal o tanggalin ang kahit "
 "na ano.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, fuzzy, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Laging mag prompt para sa compermasyon o aksyon\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, fuzzy, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5487,7 +5481,7 @@ msgstr ""
 " -y             Mag panggap na ang sagot sa simpleng tanong na oo/hindi ay "
 "'oo\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, fuzzy, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5496,7 +5490,7 @@ msgstr ""
 " -F format      ilagay ang format para i-display ang nahanap na resulta; "
 "tingnan ang manual\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, fuzzy, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5505,7 +5499,7 @@ msgstr ""
 " -O order       ilagay kung paano ang nahanap na resulta ayon sa pag-uri-"
 "uri; tingnan ang manual\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, fuzzy, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
@@ -5513,18 +5507,18 @@ msgstr ""
 " -w width       ilagay ang lapad ng display para sa formatting ng nahanap na "
 "resulta\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 " -f             Agresibong sinusubukan na ayusin ang nabasag na mga pakete.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Pakita kung anong bersyon ng pakete ang e i-instal.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -5532,13 +5526,13 @@ msgstr ""
 " -D             Pakita ang dependencies ng otomatikaling nabagong mga "
 "pakete.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 " -Z\t\t    Ipakita ang pagbabago sa installed na sukat ng bawat pakete.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, fuzzy, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5547,28 +5541,28 @@ msgstr ""
 " -v             Pakita ang karagdagang impormasyon. (siguro supplied ng "
 "maraming ulit)\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, fuzzy, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 " -t [release]   Itakda ang paglaya kung saan ang pakete ay i-installed\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr ""
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, fuzzy, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o key=val     Diretstong ilagay ang pangalan ng configuration option "
 "'key'\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, fuzzy, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5577,28 +5571,28 @@ msgstr ""
 " --with(out)-recommends\tSpecify kahit na maukol ng rekomenda \n"
 "                matibay na dependencies\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S fname       Basahin ang aptitude extended status info mula sa fname.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Kuhain ang bagong pakete sa simula.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             Ang tulong na ito\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Magsagawa ng install run sa simula.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
@@ -5607,132 +5601,112 @@ 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:393
+#: src/main.cc:359
 #, fuzzy
 msgid "trace"
 msgstr "papalitan"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 msgid "info"
 msgstr "hindi"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 msgid "error"
 msgstr "Err "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "^Isara"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Hindi tanggap na operasyon %s"
 
-#: src/main.cc:765
-#, fuzzy, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Hindi ma-buksan ang %s para sulatan"
-
-#: src/main.cc:774
-#, fuzzy, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Hindi ma-buksan ang %s para sulatan"
-
-#: src/main.cc:798
-#, fuzzy, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o kailangan ng argumento sa hubog na key=value, nakuha %s"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "KAKAIBA: di-kilala na option code natanggap\n"
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "Pakete"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "Lahat ng pakete"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5740,38 +5714,33 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Tanging isa sa -u at -i ang maaaring specified\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u at -i ay maaring hindi specified sa command-line na pamamaraan (eg, with "
 "'install')"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u at -i hindi siguro na specified na merong command"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Hindi kilalang command \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Hindi kilalang command \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr ""
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5788,7 +5757,7 @@ msgstr "Hanapin ang: "
 msgid "Search backwards for: "
 msgstr "Hanapin ang: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Taga-walis ng ginto"
 
@@ -6005,7 +5974,7 @@ msgstr ""
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 18 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Pakete"
 
@@ -6086,8 +6055,8 @@ msgstr "<N/A>"
 msgid "<none>"
 msgstr "<wala>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "birtual"
@@ -6222,7 +6191,7 @@ msgstr "Hindi ma-buksan ang %s para sulatan"
 msgid "Internal error: Default column string is unparsable"
 msgstr "Internal error: Default na hanay ng string ay unparsable"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Mga gawain"
 
@@ -6381,21 +6350,17 @@ msgstr ""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr ""
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Pinanggalingan ng pakete: "
@@ -7037,7 +7002,7 @@ msgstr "Kinakarga ang cache"
 msgid "Really quit Aptitude?"
 msgstr "Sigurado ka sa pag alis sa Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -7127,7 +7092,7 @@ msgstr ""
 msgid "License"
 msgstr "^Lisensiya"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 #, fuzzy
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Basahin ang mga tadhana kung paano makokopya ang programa"
@@ -7149,7 +7114,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Tulong"
 
@@ -7181,7 +7146,7 @@ msgstr "Markahang ^Manual"
 msgid "FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Basahin ang talaan ng madalas na tanungin"
 
@@ -7217,16 +7182,16 @@ msgid ""
 "not see this message again."
 msgstr ""
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Tingnan ang progreso ng paketeng kinukuha"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 #, fuzzy
 msgid "Package Download"
 msgstr "Pakete: "
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7238,44 +7203,44 @@ msgstr ""
 "seguridad ng inyong sistema%b. Dapat lamang na ipagpatuloy ang pagluklok "
 "kung tiyak kayong gawin ito.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 #, fuzzy
 msgid "  %S*%N %s [version %s]%n"
 msgstr "Bersyon"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Talagang magpatuloy"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Hintuin ang pagluklok"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Preview ng pagluklok ng mga pakete"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Tignan at/o ibagay ang aksyon na isasagawa"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 #, fuzzy
 msgid "Some packages were broken and have been fixed:"
 msgstr "Ang ibang pakete ay basag at iniayos"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr ""
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, fuzzy, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "Magsayang ng oras sa pag-hahanap ng mga mina"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 #, fuzzy
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
@@ -7285,19 +7250,19 @@ msgstr ""
 "pribilhiyo, na\n"
 "sa iyo kasalukuyan ay wala.  Gusto mo bang magbago sa root account?\n"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Maging root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Huwag maging root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Walang pakete ang nakatakda na iluklok, tanggalin, o i-upgrade."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 #, fuzzy
 msgid ""
 "No packages will be installed, removed or upgraded.  Some packages could be "
@@ -7310,19 +7275,19 @@ msgstr ""
 "iapgreyd\n"
 "ang mga ito. Pindutin ang \"U\" upang maghanda ng pag-apgreyd."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Ina-update ang listahan ng mga pakete"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Tingnan ang update na progreso ng mga pakete sa listahan"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr ""
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 #, fuzzy
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
@@ -7332,24 +7297,24 @@ msgstr ""
 "na\n"
 "sa iyo kasalukuyan ay wala.  Gusto mo bang magbago sa root account?\n"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Magsayang ng oras sa pag-hahanap ng mga mina"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr ""
 "Paglilinis habang ang pagkuha ay nasa progreso ay hindi pina hi-hintulutan"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Binubura ang mga na-download na files"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Nakuhang pakete files ay nabura na"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7359,18 +7324,18 @@ msgstr ""
 "na\n"
 "sa iyo kasalukuyan ay wala.  Gusto mo bang magbago sa root account?\n"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr ""
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, fuzzy, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "Laos na talaksang pakete ay nabura na"
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7380,129 +7345,129 @@ msgstr ""
 "na\n"
 "sa iyo kasalukuyan ay wala.  Gusto mo bang magbago sa root account?\n"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr ""
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr ""
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 #, fuzzy
 msgid "Ran out of time while trying to find a solution."
 msgstr "Magsayang ng oras sa pag-hahanap ng mga mina"
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 #, fuzzy
 msgid "Resolve Dependencies"
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 #, fuzzy
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Hanapin ang sumunod na pakete na may hindi masiya na dependencies"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, fuzzy, c-format
 msgid "Unable to open %ls"
 msgstr "Hindi ma-buksan ang %s para sulatan"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Iluklok/tanggalin ang mga pakete"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Update ang pakete list"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 #, fuzzy
 msgid "Mark Up^gradable"
 msgstr "Markahan ng ^Upgradable"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Kalimutan ang mga bagong pakete"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 #, fuzzy
 msgid "Canc^el pending actions"
 msgstr "Pakete na umaasa sa %s"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Linisin ang mga cache ng pakete"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Linisin ang  ^obsolete files"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "^Reload ang pakete cache"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "^Maglaro ng Minesweeper"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "^Maging root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "^Umalis"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Ibalik"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Instal"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 "Bandilaan ang kasalukuyan ay napiling pakete para sa installation o upgrade"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Tanggalin"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Bandilaan ang kasalukuyan ay napiling pakete para sa pagalis"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Purge"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Bandilaan ang kasalukuyan ay napiling pakete at ang configuration files para "
 "sa pagtanggal"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Itago"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Kansel ang anumang aksyon sa napiling pakete"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Pigilin"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7510,11 +7475,11 @@ msgstr ""
 "Kansel ang anumang aksyon sa napiling pakete, at protektahan sa balang araw "
 "na upgrades"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Markahang ^Auto"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 #, fuzzy
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
@@ -7523,11 +7488,11 @@ msgstr ""
 "Markahan ang napiling pakete bilang otomatikong na instal;\n"
 "itoy otomatikong ma-tatanggal pag walang anomang paketeng naka-depende dito"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Markahang ^Manual"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 #, fuzzy
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
@@ -7536,11 +7501,11 @@ msgstr ""
 "Markahan ang napiling pakete bilang manually na na-instal;\n"
 "itoy hindi ma-tatanggal ngunit kung itoy iyong manually na tatanggalin"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "^Forbid Na Salin"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 #, fuzzy
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
@@ -7549,354 +7514,354 @@ msgstr ""
 "Ipagbawal ang kandidato na salin ng piniling pakete na ma-installed;\n"
 "bagong salin ng pakete ay ma-installed syempre"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "I^mpormasyon"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Pakita ang higit na impormasyon tungkol sa piniling pakete"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Ipakita ang Debian changelog ng napiling pakete"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr ""
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr ""
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr ""
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 #, fuzzy
 msgid "^Next Solution"
 msgstr "^Mabalik ang options"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 #, fuzzy
 msgid "Select the next solution to the dependency problems."
 msgstr "Hanapin ang sumunod na pakete na may hindi masiya na dependencies"
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 #, fuzzy
 msgid "^Previous Solution"
 msgstr "Provides"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 #, fuzzy
 msgid "Select the previous solution to the dependency problems."
 msgstr "Hanapin ang sumunod na pakete na may hindi masiya na dependencies"
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 #, fuzzy
 msgid "^First Solution"
 msgstr "^Mabalik ang options"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 #, fuzzy
 msgid "Select the first solution to the dependency problems."
 msgstr "Hanapin ang sumunod na pakete na may hindi masiya na dependencies"
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 #, fuzzy
 msgid "^Last Solution"
 msgstr "^Mabalik ang options"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 #, fuzzy
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "Hanapin ang sumunod na pakete na may hindi masiya na dependencies"
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr ""
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr ""
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr ""
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 #, fuzzy
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Bandilaan ang kasalukuyan ay napiling pakete para sa pagalis"
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr ""
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr ""
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Hanap"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 #, fuzzy
 msgid "Search forwards"
 msgstr "Maghanap ng:"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr ""
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 #, fuzzy
 msgid "Search backwards"
 msgstr "Hanapin ang: "
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Humanap ^Ulit"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Ulitin ang huling pag-hahanap"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 #, fuzzy
 msgid "Find Again ^Backwards"
 msgstr "Humanap ^Ulit"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 #, fuzzy
 msgid "Repeat the last search in the opposite direction"
 msgstr "Ulitin ang huling pag-hahanap"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Limitahan ang pag-papakita"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Apply ang filter sa listahan ng mga pakete"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^Un-Limit Display"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Alisin ang filter sa mga listahan ng pakete"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Hanapin ang ^Basag"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Hanapin ang sumunod na pakete na may hindi masiya na dependencies"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 #, fuzzy
 msgid "^Preferences"
 msgstr "PreDepends"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^UI options"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Baguhin ang settings na maapektuhan ang user interface"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Dependency na pag-tagan"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 "Palitan ang settings na makaka apekto kung paano ang pakete dependencies ay "
 "hawakan"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Miscellaneous"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Palitan ang samut-samot na programa settings"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Mabalik ang options"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Ibalik ang lahat ng settings sa system default"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Susunod"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Pakita ang susunod na display"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Nakaraan"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Pakita ang nakaraang display"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Isara"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Isara ang display"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "^Tanaw ng Bagong mga Pakete"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Gumawa ng bagong default pakete view"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 #, fuzzy
 msgid "Audit ^Recommendations"
 msgstr "Rekomendasyon"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr ""
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 #, fuzzy
 msgid "New ^Flat Package List"
 msgstr "^Tanaw ng Bagong mga Pakete"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 #, fuzzy
 msgid "New ^Debtags Browser"
 msgstr "Bagong Kategoryang ^Browser"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 #, fuzzy
 msgid "Browse packages using Debtags data"
 msgstr "Silipin ang pakete ayon sa kategorya"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Bagong Kategoryang ^Browser"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Silipin ang pakete ayon sa kategorya"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Tungkol"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Basahin ang impormasyon tungkol sa programang ito"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Tulong"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Basahin ang tulong na on-line"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Manwal ng Pag-gamit"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Basahin ang detalyadong manwal ng programa"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^FAQ"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 #, fuzzy
 msgid "^News"
 msgstr "Bago"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Tignan ang mga mahalagang pagbabago sa bawat bersyon ng programa"
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Lisensiya"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Mga Gagawin"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Paghahanap"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Mga Pagpipilian"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Mga Pananaw"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, fuzzy, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7904,11 +7869,11 @@ msgid ""
 msgstr ""
 "%s: Menu  %s: Tulong %s: Quit %s: Apdeyt  %s: Kumuha/Instol/Tanggal ng Pkt"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "o"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "h"
 
@@ -7937,9 +7902,43 @@ msgstr "URL na gamitin upang kunin ang mga changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Kinukuha ang Changelog"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Maari lang tignan ang mga changelog ng mga opisyal na paketeng Debian."
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL na gamitin upang kunin ang mga changelog"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "Hindi opisyal na pakete ng Debian ang %s, hindi maipakita ang changelog "
+#~ "nito."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Hindi mahanap ang paketeng nagngangalang \"%s\""
+
+#, fuzzy
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Hindi ma-buksan ang %s para sulatan"
+
+#, fuzzy
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Hindi ma-buksan ang %s para sulatan"
+
+#, fuzzy
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Hindi ma-buksan ang %s para sulatan"
+
+#, fuzzy
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o kailangan ng argumento sa hubog na key=value, nakuha %s"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "KAKAIBA: di-kilala na option code natanggap\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u at -i hindi siguro na specified na merong command"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr ""
+#~ "Maari lang tignan ang mga changelog ng mga opisyal na paketeng Debian."
 
 #~ msgid "Unable to open /usr/share/tasksel/debian-tasks.desc"
 #~ msgstr "Hindi mabuksan ang /usr/share/tasksel/debian-tasks.desc"
@@ -8048,10 +8047,6 @@ msgstr "Maari lang tignan ang mga changelog ng mga opisyal na paketeng Debian."
 #~ msgstr "Kinukuha ang Changelog"
 
 #, fuzzy
-#~ msgid "No changelog found."
-#~ msgstr "^Dependency na pag-tagan"
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Hindi ma-buksan ang pakete hierarchy file %s"
diff --git a/po/tr.gmo b/po/tr.gmo
index 3fd0c0c7..338d67dc 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index baa58d7b..f6484117 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-02-23 16:54+0800\n"
 "Last-Translator: Erçin EKER <ercin.eker@linux.org.tr>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
@@ -309,71 +309,60 @@ msgid ""
 msgstr ""
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "Değişim günlüklerini indirmek için kullanılacak URL(adres)"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Herhangi bir işlemden önce neler yapılacağına dair bir özet göster"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr ""
 "Paket listeleri güncellendiğinde hangi paketlerin \"yeni\" olduğunu unut"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Paket kurulumu ya da kaldırmadan sonra hangi paketlerin \"yeni\" olduğunu "
 "unut"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
 "command-line."
 msgstr ""
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "Salt-okunur durumdayken yapılan ilk değişiklikte hata mesajı gösterme"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
 "change to the system."
 msgstr ""
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Root olmayan bir kullanıcı, yetki gerektiren bir işlem yapmaya çalıştığında "
 "uyar"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -381,11 +370,11 @@ msgid ""
 "in as root and perform the action with root privileges."
 msgstr ""
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Günlüğün tutulacağı dosya"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -393,11 +382,11 @@ msgid ""
 "shell command that is to receive the log on standard input."
 msgstr ""
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Bir paket seçildiğinde bağımlılıkları otomatik olarak çözümle"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -405,12 +394,12 @@ msgid ""
 "but may produce suboptimal results or fail entirely in some scenarios."
 msgstr ""
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "Kurma ya da kaldırma işlemlerinden önce bozuk paketleri otomatik düzelt"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -418,12 +407,12 @@ msgid ""
 "a solution to the broken dependencies."
 msgstr ""
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 #, fuzzy
 msgid "Install recommended packages automatically"
 msgstr "Önerilen paketleri otomatik olarak kur"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -434,11 +423,11 @@ msgid ""
 "automatically removed."
 msgstr ""
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Kullanılmayan paketleri otomatik olarak kaldır"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -449,22 +438,22 @@ msgid ""
 "installed package recommends them."
 msgstr ""
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr ""
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -477,17 +466,17 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 #, fuzzy
 msgid "UI options"
 msgstr "^Arayüz seçenekleri"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 #, fuzzy
 msgid "Dependency handling"
 msgstr "^Bağımlılık işleme"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Çeşitli"
 
@@ -587,7 +576,7 @@ msgstr "\"%2$s\" paketi için \"%1$s\" arşivi bulunamıyor\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "\"%s\"deki dosyalar listelenemiyor"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -596,7 +585,7 @@ msgstr ""
 "Not: \"%s\", Sanal paket sağlıyor\n"
 "      \"%s\", zaten kurulu.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -605,7 +594,7 @@ msgstr ""
 "Not: \"%s\", Sanal paket sağlıyor\n"
 "      \"%s\", zaten kurulacak.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -614,17 +603,23 @@ msgstr ""
 "\"%s\" paket veritabanında var, fakat gerçek bir\n"
 "paket değil ve hiç bir paket tarafından sağlanmıyor.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "%s bir sanal paket, ve şu paket tarafından sağlanıyor:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Kurmak için birini seçmelisiniz.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "%s paketi kurulu değil, bu nedenle yükseltilmesi engellenemez\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -633,62 +628,55 @@ msgstr ""
 "Not: \"%2$s\" sanal paketi yerine\n"
 "      \"%1$s\" seçiliyor\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s paketinin istenen sürümü zaten kurulu (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s şu anda kurulu değil, bu nedenle yeniden yüklenmeyecek.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s paketinin istenen sürümü zaten kurulu (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s şu anda kurulu değil, bu nedenle yeniden yüklenmeyecek.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "%s paketi kurulu değil, bu nedenle kaldırılmayacak\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "%s paketi kurulu değil, bu nedenle yükseltilmesi engellenemez\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "%s paketi yükseltilemez, bu nedenle yükseltilmesi engellenemez\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Not: \"%s: %s\" görevi kurulum için seçildi\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Paket sürümünü sadece 'install' ya da 'forbid-version' komutu ile "
-"kullanabilirsiniz.\n"
+"kullanabilirsiniz"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "'kur' komutu için yalnızca bir paket arşivi belirtebilirsiniz\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "'kur' komutu için yalnızca bir paket arşivi belirtebilirsiniz"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -697,7 +685,7 @@ msgstr ""
 "\"%s\" paketi bulunamadı, ve 40'tan fazla\n"
 "paketin isminde \"%s\" bulunmakta.\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -706,12 +694,12 @@ msgstr ""
 "\"%s\" paketi bulunamadı.  Bununla beraber aşağıdaki\n"
 "paketlerin isimlerinde \"%s\" bulunmakta:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Adında ya da tanımında \"%s\" içeren hiçbir paket bulunamadı\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -729,7 +717,7 @@ msgstr ""
 "\"%s\" için uygun paket bulunamadı, Bununla beraber,\n"
 "aşağıdaki paketlerin açıklamalarında \"%s\" geçmekte:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Kötü eylem karakteri '%c'\n"
@@ -752,28 +740,23 @@ msgstr "Hata"
 msgid "Changelog download failed: %s"
 msgstr "%s için değişim günlüğü"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "Sensible-pager çalıştırılamıyor, bu çalışan bir Debian sistemi mi?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "%s resmi bir Debian paketi değil, değişiklik güncesi gösterilemiyor."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "%s için değişiklik güncesi bulunamıyor"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "%s için değişiklik güncesi bulunamıyor"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, fuzzy, c-format
-msgid "E: The clean command takes no arguments\n"
+#, fuzzy
+msgid "The clean command takes no arguments"
 msgstr "E: Güncelle komutu argüman kabul etmez\n"
 
 #: src/cmdline/cmdline_clean.cc:66
@@ -781,69 +764,62 @@ msgstr "E: Güncelle komutu argüman kabul etmez\n"
 msgid "Del %s* %spartial/*\n"
 msgstr "Silinsin mi?  %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr "Ev klasörünüz belirlenedi, /tmp/function_pkgs olarak kaydediliyor!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "%s %s [%sB] sil\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, fuzzy, c-format
-msgid "E: The autoclean command takes no arguments\n"
+#: src/cmdline/cmdline_clean.cc:127
+#, fuzzy
+msgid "The autoclean command takes no arguments"
 msgstr "E: Güncelle komutu argüman kabul etmez\n"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "%sB'lık alan boşaltılacak\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "%sB'lık alan boşaltıldı\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Geçersiz işlem %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "\"keep-all\"dan sonra beklenmeyen kalıp değişkeni"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, fuzzy, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+#, fuzzy
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr "Bağımlılıklar çözülemiytor."
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Ä°ptal.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "indirme: indirmek için en az bir paket belirtmelisiniz\n"
+msgid "download: you must specify at least one package to download"
+msgstr "indirme: indirmek için en az bir paket belirtmelisiniz"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Kaynak listesi okunamıyor"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "\"%s\" adında bir paket bulunamıyor"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -884,30 +860,22 @@ msgid "[Working]"
 msgstr "[Çalışılıyor]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "\"%s\" diye bir paket yok "
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, fuzzy, c-format
-msgid "E: The forget-new command takes no arguments\n"
+#, fuzzy
+msgid "The forget-new command takes no arguments"
 msgstr "E: Güncelle komutu argüman kabul etmez\n"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Hangi paketlerin yeni olduÄŸu unutulsun mu\n"
@@ -1017,17 +985,17 @@ msgstr "Aşağıdaki paketler yükseltilecek:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Aşağıdaki paketler yükseltilecek:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Aşağıdaki TEMEL paketler KALDIRILACAK!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Bu işlem aşağıdaki TEMEL paketleri BOZACAK:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1036,16 +1004,16 @@ msgstr ""
 "UYARI: Bu işlemi gerçekleştirmek sisteminize zarar verebilir!\n"
 "       TAM OLARAK ne yaptığınızdan emin olmadan DEVAM ETMEYİN!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Bunun kötü bir fikir olduğunun farkındayım"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Devam etmek için, \"%s\" ifadesini girin :\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1062,7 +1030,7 @@ msgstr ""
 "devam etmelisiniz.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1072,7 +1040,7 @@ msgstr ""
 "                  %s::CmdLine::Ignore-Trust-Violations 'true' olarak "
 "ayarlanmış!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 #, fuzzy
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1087,7 +1055,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1096,130 +1064,130 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Bu uyarıyı göz ardı ederek yine de devam etmek ister misiniz?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Devam etmek için \"%s\"; çıkmak için \"%s\" girin: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Tanınmayan girdi.  Ya \"%s\" ya da \"%s\" girin.\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Aşağıdaki paketlerin kurulması ÖNERİLDİ, fakat KURULMAYACAK:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Aşağıdaki paketlerin kurulması TEKLİF EDİLDİ, fakat kurulmayacak:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Hiçbir paket kurulmayacak, yükseltilmeyecek ya da kaldırılmayacak.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu paket yükseltildi, %lu yeni kuruldu, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu yeniden kuruldu, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu eski sürümü yüklendi,"
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu kaldırıldı, %lu yükseltilmedi.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Arşivden %sB/%sB alınacak."
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Arşivlerden %sB veri alınacak."
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Paketler açıldıktan sonra %sB yer kullanılacak.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Paketler açıldıktan sonra %sB serbest kalacak.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Gösterilecek paket yok -- 'i'ye bastıktan sonra çıkan satıra paket "
 "isimlerini girin.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Devam etmek için Enter tuşuna basın."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Paket bulunamadı -- 'c'ye bastıktan sonra çıkan satıra paket isimlerini "
 "girin.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, 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:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "kurulum ile devam et"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "iptal et ve çık"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1227,12 +1195,12 @@ msgstr ""
 "bir ya da daha çok paket hakkında bilgi göster; paket isimleri 'i'yi takip "
 "etmeli"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1240,63 +1208,63 @@ msgstr ""
 "bir ya da daha çok paketin Debian değişiklik güncesini göster; paket "
 "isimleri 'c'yi takip etmeli"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "bağımlılık bilgisi görünümünü değiştir"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "paket boyutundaki değişim görünümünü değiştir"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "sürüm numaraları görünümünü değiştir"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "tam görsel arayüze geç"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1307,46 +1275,46 @@ msgstr ""
 "daha fazla paket isminden (veya parçası) sonra bir eylem karakteri girin. "
 "Eylem belirttiğiniz paketler üstünde işleme sokulacaktır. Mevcut eylemler: "
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "Paket kurmak için '+'"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "Paketleri kurmak ve hemen otomatik kuruldu olarak işaretlemek için '+M'"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "Paket kaldırmak için '-'"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "Paketi temizlemek için '_'"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "Paketi tutmak için '='"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "paketleri mevcut duruma sabitlemek için ':'"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "Paketi otomatik kurulmuş olarak işaretlemek için'&M'"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "Paketleri elle kurulmuş olarak işaretlemek için '&m'"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1354,54 +1322,54 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "Paketi otomatik kurulmuş olarak işaretlemek için'&M'"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Komutlar:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 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:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Devam etmek istiyor musunuz? [Y/n/?]"
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Geçersiz cevap.  Lütfen geçerli bir komut girin ya da yardım için '?'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 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:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1412,7 +1380,7 @@ msgstr ""
 "Bağımlılık bilgisi gösterilecek.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1423,7 +1391,7 @@ msgstr ""
 "Bağımlılık bilgisi gösterilmeyecek.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1434,7 +1402,7 @@ msgstr ""
 "Sürümler gösterilecek.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1445,7 +1413,7 @@ msgstr ""
 "Sürümler gösterilmeyecek.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1456,7 +1424,7 @@ msgstr ""
 "Boyut değişiklikleri gösterilecek.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1585,6 +1553,11 @@ msgstr "'%c'yi takiben en az bir paket/sürüm çifti gerekli"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "\"%s\"den sonra sürüm gerekiyor"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "\"%s\" diye bir paket yok "
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1731,7 +1704,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1760,7 +1733,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Åžu komutlar mevcut:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Çözümleyici durumunu dosyaya yaz:"
 
@@ -1790,7 +1763,7 @@ msgid ""
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1799,25 +1772,24 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Başımlılık çözülemiyor! Vazgeçiliyor..."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Bağımlılıklar çözülemiytor."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "%s için iconv hatalı.\n"
+msgid "iconv of %s failed"
+msgstr "%s için iconv hatalı"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "Arama: En az bir arama terimi girmelisiniz\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "Arama: En az bir arama terimi girmelisiniz"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1860,7 +1832,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Aşağıdaki paketler bağımlılıkları karşılamıyor:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<BOÅž>"
@@ -2084,7 +2056,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Sağladığı"
 
@@ -2098,15 +2070,11 @@ msgstr "Tanım: "
 msgid "Homepage: "
 msgstr ""
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "%s paketi konumlandırılamıyor"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "%s kalıbı ayrıştırılamıyor"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+#, fuzzy
+#| msgid "No resolution found."
+msgid "No packages found"
+msgstr "Çözüm bulunamadı."
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2117,14 +2085,13 @@ msgstr "Paketleri indir/kur/kaldır.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "İç hata, istek bitirilemedi"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Ä°ndirilen eskimiÅŸ dosyalar siliniyor"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: Güncelle komutu argüman kabul etmez\n"
+msgid "The update command takes no arguments"
+msgstr "Güncelle komutu argüman kabul etmez"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, fuzzy, c-format
@@ -2141,127 +2108,149 @@ msgstr "\"%2$s\" paketi için sürüm \"%1$s\" bulunamıyor\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "%s için kullanılabilir bir sürüm bulunamadı\n"
+msgid "No candidate version found for %s"
+msgstr "%s için kullanılabilir bir sürüm bulunamadı"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "%s'in mevcut bir sürümü bulunamadı\n"
+msgid "No current or candidate version found for %s"
+msgstr "%s'in mevcut bir sürümü bulunamadı"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "\"%2$s\" paketi için \"%1$s\" arşivi bulunamıyor\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "\"%2$s\" paketi için \"%1$s\" arşivi bulunamıyor"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "\"%2$s\" paketi için sürüm \"%1$s\" bulunamıyor\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "\"%2$s\" paketi için sürüm \"%1$s\" bulunamıyor"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "İç hata: \"cmdline_find_ver\"e hatalı değer '%i' geçildi!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "İç hata: \"cmdline_find_ver\"e hatalı değer '%i' geçildi!"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Bir paket için bir arşiv ve bir sürümü birlikte belirtemezsiniz\n"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Bir paket için bir arşiv ve bir sürümü birlikte belirtemezsiniz"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "%s için değişiklik güncesi bulunamıyor"
-
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "%s paketi konumlandırılamıyor"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "%s için değişiklik güncesi bulunamıyor"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Not: \"%s: %s\" görevi kurulum için seçildi\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "%s için değişiklik güncesi bulunamıyor"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Paketler"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Kaynak paketi: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "ArÅŸiv"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "Arama: En az bir arama terimi girmelisiniz\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2287,7 +2276,7 @@ msgstr ""
 msgid "Candidate"
 msgstr "AdaySür"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Kur"
 
@@ -2391,21 +2380,19 @@ msgstr "Uygulanabilir bir çözüm bulunamadı."
 msgid "Packages requiring %s:"
 msgstr "%s paketine bağımlı paketler"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, fuzzy, c-format
 msgid "No package named \"%s\" exists."
 msgstr "\"%s\" adında bir paket bulunamıyor"
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 #, fuzzy
 msgid "Unable to parse some match patterns."
 msgstr "%s kalıbı ayrıştırılamıyor"
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
 
 #: src/cmdline/cmdline_why.h:212
@@ -2432,11 +2419,11 @@ msgstr " KARÅžILANAMAZ"
 msgid "UNAVAILABLE"
 msgstr "MEVCUT DEĞİL"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Etiketler"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 #, fuzzy
 msgid "User Tags"
 msgstr "Etiketler"
@@ -2638,31 +2625,31 @@ msgstr ""
 "Tampon dosyası kilitlenemiyor. Salt-okunur halde açılıyor; bu durumda paket "
 "durumlarında yaptığınız değişiklikler SAKLANMAYACAKTIR!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "main"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2729,34 +2716,40 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr "Paket tamponu mevcut değil; paketler indirilip kurulamıyor"
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "İç hata: indirilecek paketlerin listesi oluşturulamıyor"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, fuzzy, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "%s'i %s olarak yeniden adlandırmada hata"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Mevcut olmayan paketler için düzeltme yapılamıyor"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Bir paket kurulamadı.  Düzeltilmeye çalışılıyor:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -2905,13 +2898,13 @@ msgstr ""
 "\n"
 "Günlük tamamlandı.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "Paketler indiriliyor"
@@ -3022,18 +3015,18 @@ msgstr ""
 "Paket indeks dosyaları bozulmuş. %s paketi için hiç bir \"Filename:\" alanı "
 "bulunamadı"
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "%s için değişim günlüğü"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "Değişim günlüklerini indirmek için kullanılacak URL(adres)"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "Değişim günlüklerini indirmek için kullanılacak URL(adres)"
@@ -3082,26 +3075,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "%s kalıbı ayrıştırılamıyor"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Etiket veritabanı oluşturuluyor"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "Kurulmadı"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "Kurulmadı"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3250,42 +3244,42 @@ msgstr ""
 msgid "_File"
 msgstr "Kapat"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Bekleyen tüm kurulum ve kaldırma işlemlerini gerçekleştirir"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Paketleri yeni sürümleri için denetler"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "Güncellenmemek üzere tutulan paketler dışındaki tüm paketleri güncellemek "
 "için işaretler"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Yeni paketleri unutur"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Bekleyen tüm kurulum, kaldırma, tutma ve yükseltme işlemlerini iptal et."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Daha önce indirilmiş paket dosyalarını siler"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Artık indirilemeyecek olan (eski) paket dosyalarını siler"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Paket önbelleğini yeniden yükle"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3295,7 +3289,7 @@ msgstr ""
 "Root olmak için 'su' komutunu çalıştır; bu işlem uygulamayı yeniden "
 "başlatır, ama ayarlarınız korunacaktır"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Uygulamadan çıkar"
 
@@ -3303,7 +3297,7 @@ msgstr "Uygulamadan çıkar"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Son yapılan paket işlemini veya işlem grubunu geri alır"
 
@@ -3337,7 +3331,7 @@ msgid "_Help"
 msgstr "Yardım"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3346,19 +3340,19 @@ msgstr ""
 msgid "Update"
 msgstr "Liste Güncelleme"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Paketler"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Önizleme"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Çözüm Üreticisi"
 
@@ -3545,7 +3539,7 @@ msgid "Fix Manually"
 msgstr "Kılavuz"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Yükselt"
 
@@ -4078,11 +4072,11 @@ msgstr "Kurulu"
 msgid "Reinstall"
 msgstr "Tekrar kur"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Eski sürümü kur"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Kaldır"
 
@@ -4118,7 +4112,7 @@ msgstr "Paket listesini filtrele"
 msgid "Download already running."
 msgstr "Ä°ndiriliyor..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Paket listesi güncellemesi veya kurulum işlemi zaten sürüyor."
 
@@ -4179,37 +4173,37 @@ msgstr "Kırık paket yok."
 msgid "Asking whether to replace the configuration file %s"
 msgstr "%s yeni yapılandırma dosyası ile değiştirilemiyor"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Paketler indiriliyor"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "Kırık paket yok."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "Kırık paket yok."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "Bağımlılıkları çözümle"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Bozuk paket bulunmuyor."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s deÄŸiÅŸiklikleri"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s deÄŸiÅŸiklikleri"
@@ -4217,7 +4211,7 @@ msgstr "%s deÄŸiÅŸiklikleri"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4226,63 +4220,63 @@ msgstr[0] "%d kurulacak"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "%s kaldırılırken hata oluştu"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "Ä°ndirmeBoyutu"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "kurulmadı"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "Kurulu"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "^Temizle"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Koru"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Tut"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "Kullanıcı Kılavuzu"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4320,7 +4314,7 @@ msgstr "hayır"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4365,17 +4359,17 @@ msgstr "%s; otomatik olarak kurulacak"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "Ara"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "Görüntü oluşturuluyor"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Görüntü oluşturuluyor"
@@ -5061,113 +5055,114 @@ msgstr "Bilinmeyen hizalama tipi '%s'"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "İsme göre sıralama kuralı argüman almaz"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Geçersiz sıfır uzunluklu kural adı"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Sıralama kuralı tanımında eşleştirilemeyen '('"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Geçersiz sıralama kuralı tipi '%s'"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "\"%ls\"den sonra çoklu bayt dizgisi çözülemiyor"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "\"%s\"den sonra geniş karakter dizgisi çözüleniyor"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s derlendi %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Derleyici: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 #, fuzzy
 msgid "Compiled against:\n"
 msgstr "Derleyici: g++ %s\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, fuzzy, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "%F'in %s (%s) sürümünü tut"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, fuzzy, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 "\n"
 "NCurses sürümü: %s\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, fuzzy, c-format
 msgid "  NCurses version %s\n"
 msgstr ""
 "\n"
 "NCurses sürümü: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, fuzzy, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "libsigc++ sürümü: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "%F'in %s (%s) sürümünü tut"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "%F'in %s (%s) sürümünü tut"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s derlendi %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr ""
 
-#: src/main.cc:184
+#: src/main.cc:181
 #, fuzzy
 msgid ""
 "\n"
@@ -5176,36 +5171,36 @@ msgstr ""
 "\n"
 "Curses sürümü: %s\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, fuzzy, c-format
 msgid "  NCurses version: %s\n"
 msgstr ""
 "\n"
 "NCurses sürümü: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, fuzzy, c-format
 msgid "  cwidget version: %s\n"
 msgstr "libsigc++ sürümü: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, fuzzy, c-format
 msgid "  Apt version: %s\n"
 msgstr ""
 "\n"
 "Curses sürümü: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Kullanım: aptitude [-S dosyaadı [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [seçenekler] <eylem> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5214,43 +5209,43 @@ msgstr ""
 "  Eylemler (eğer seçilmemişse, aptitude etkileşimli kipe girer):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, fuzzy, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr "install      - Paketleri kur/güncelle\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, fuzzy, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Paketleri kaldır\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, fuzzy, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Paketleri ve onlara ait ayar dosyalarını kaldır\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, fuzzy, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Paketleri tut\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, fuzzy, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold         - Bir paket için hold(tut) komutunu iptal et\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, fuzzy, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr ""
 "markauto     - Paketler otomatik olarak kurulacak ÅŸekilde iÅŸaretlenir\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, fuzzy, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto     - Paketler elle kurulacak ÅŸekilde iÅŸaretlenir\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5259,17 +5254,17 @@ msgstr ""
 " forbid-version - Aptitude'un belirli bir paket sürümüne yükseltmesini "
 "engelle.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, fuzzy, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update     - Yeni/güncellenebilir paketlerin listesini indir\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, fuzzy, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " upgrade     - Güvenli bir güncelleme uygula\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, fuzzy, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5278,59 +5273,59 @@ msgstr ""
 " dist-upgrade    Güncelleme uygula, mümkün olduğunca paketleri kur ve "
 "kaldır\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, fuzzy, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr "forget-new       Hangi paketlerin \"yeni\" olduÄŸunu unut\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, fuzzy, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Paketleri ismine ve/veya tanımlara göre ara\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, fuzzy, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Bir paket hakkında detaylı bilgi göster\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Bir paket hakkında detaylı bilgi göster\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, fuzzy, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean         - İndirilmiş paket dosyalarını sil\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, fuzzy, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Eski indirilmiş paket dosyalarını sil\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, fuzzy, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Paketin değişiklik güncesini göster\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, fuzzy, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download    - Bir paket için .deb dosyasını indir\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, fuzzy, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
 msgstr " reinstall    - Zaten kurulu olan paketi indir ve yeniden kur\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, fuzzy, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5340,7 +5335,7 @@ msgstr ""
 " -Z\t\t     Her bir paketin kurulduktan sonraki büyüklük değişikliğini "
 "göster.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, fuzzy, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5351,56 +5346,56 @@ msgstr ""
 " -Z\t\t     Her bir paketin kurulduktan sonraki büyüklük değişikliğini "
 "göster.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Seçenekler:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, fuzzy, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Bu yardım metni\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Bu yardım metni\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Eylemi simule et, fakat işlemi gerçekleştirme.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 " -d             Sadece paketleri indir, hiç bir şey kurma ya da kaldırma\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, fuzzy, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -p             Her zaman onay için ya da eylem için sor\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, fuzzy, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5408,7 +5403,7 @@ msgstr ""
 " -y             Sadece evet/hayır şeklindeki sorulara onaya gerek kalmadan "
 "'evet' de\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, fuzzy, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5417,7 +5412,7 @@ msgstr ""
 " -F format      Arama sonuçlarını göstermek için bir biçem belirle; kılavuza "
 "bakın\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, fuzzy, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5426,62 +5421,62 @@ msgstr ""
 " -O düzen       Arama sonuçlarının nasıl sıralanacağını belirt; kılavuza "
 "bakın\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, fuzzy, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w genişlik       Arama sonuçları için gösterme genişliği belirt\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Kırık paketleri zorla düzeltmeye çalış.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Paketlerin hangi sürümlerinin kurulacağını göster.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 " -D             Otomatik olarak değişecek bağımlılık dosyalarını göster.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 " -Z\t\t     Her bir paketin kurulduktan sonraki büyüklük değişikliğini "
 "göster.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, fuzzy, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
 msgstr " -v             Ekstra bilgi göster. (birden fazla desteklenebilir)\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, fuzzy, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [sürüm]   Paketlerin kurulacağı sürümü ayarla\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, fuzzy, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr " -q             Komut satırı kipinde, aşama göstergesini gizler.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, fuzzy, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=değ     'key' yapılandırma seçeneğini doğrudan değiştir\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, fuzzy, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5491,159 +5486,139 @@ msgstr ""
 "olarak\n"
 "                var sayılıp sayılmayacağını belirler.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S dosyaadi: aptitude geliÅŸmiÅŸ durum bilgisini dosyaadi'ndan oku.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Başlangıçta yeni paket listelerini indir.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             Bu yardım metni\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Bir kurulum yap ve başlangıçta çalıştır.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Bu yetenek Süper İnek Güçlerine sahip değil.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 msgid "trace"
 msgstr "yerini alırsa"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 msgid "info"
 msgstr "hayır"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 msgid "error"
 msgstr "Hata"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "Kapat"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Geçersiz işlem %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "-q='dan sonra sayı belirtilmeli\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "-q='dan sonra sayı belirtilmeli, %s kullanılmış\n"
-
-#: src/main.cc:798
-#, fuzzy, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o key=değer şeklinde bir seçenek gerekiyor, %s elde edildi"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "TUHAFLIK: bilinmeyen seçenek kodu alındı\n"
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "Paket"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "Tüm Paketler"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5651,36 +5626,31 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Yalnızca -u ve -i den biri belirtilmeli\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr "-u ve -i komut satırı kipinde belirtilemez (ör. 'install' ile)"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u ve -i bir komutla birlikte kullanılamaz"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Bilinmeyen komut \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "Bilinmeyen komut \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Tutulamayan istisna: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, fuzzy, c-format
 msgid ""
 "Backtrace:\n"
@@ -5698,7 +5668,7 @@ msgstr "Ara: "
 msgid "Search backwards for: "
 msgstr "Geriye doÄŸru ara: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Mayın tarlası"
 
@@ -5907,7 +5877,7 @@ msgstr "UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Paket"
 
@@ -5988,8 +5958,8 @@ msgstr "<yok>"
 msgid "<none>"
 msgstr "<yok>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "sanal"
@@ -6123,7 +6093,7 @@ msgstr "\"%ls\"den sonra paket gösterimi kod dönüşümü yapılamıyor"
 msgid "Internal error: Default column string is unparsable"
 msgstr "İç hata: Varsayılan kolon dizgisi ayrıştırılamaz"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Görevler"
 
@@ -6279,21 +6249,17 @@ msgstr "Sonuç indeksleri 1 ya da daha çok olmalı, \"%s\" değil"
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "%ls sonuç indeksi çok büyük; uygun gruplar (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "ETÄ°KETSÄ°Z PAKETLER"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "UNUTULMUÅž ETÄ°KET"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Kaynak paketi: "
@@ -6915,7 +6881,7 @@ msgstr "Önbellek yükleniyor"
 msgid "Really quit Aptitude?"
 msgstr "Aptitude'dan çıkılsın mı?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -6997,7 +6963,7 @@ msgstr ""
 msgid "License"
 msgstr "^Lisans"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 #, fuzzy
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Uygulamayı kopyalayabileceğiniz koşulları görüntüler"
@@ -7019,7 +6985,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Yardım"
 
@@ -7049,7 +7015,7 @@ msgstr "Kılavuz"
 msgid "FAQ"
 msgstr "^SSS"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Sık sorulan soruların bir listesini görüntüle"
 
@@ -7089,15 +7055,15 @@ msgstr ""
 "%n Bu klasörü tüm içeriği ile birlikte silmek istiyor musunuz? Eğer \"Hayır"
 "\"ı seçecek olursanız bu iletiyi bir daha görmeyeceksiniz."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Paket indirme işlemi için ilerleme durumunu göster"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Paket Ä°ndirme"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7109,35 +7075,35 @@ msgstr ""
 "yapmak istediÄŸiniz ÅŸeyin bu olduÄŸuna kesin eminseniz kuruluma devam "
 "etmelisiniz.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [sürüm %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Gerçekten Devam et"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Kurulumdan Çık"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Paket kurulumu önizlemesi"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Yapılacak değişiklikleri görüntüle ve/veya değiştir"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Bazı paketler bozuktu ve düzeltildi:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Bu bağımlılık sorunları için bir çözüm bulunmuyor!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7146,7 +7112,7 @@ msgstr ""
 "Bağımlılıkları çözmeye çalışırken zaman doldu (denemeye devam etmek için \"%s"
 "\"e basın)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7154,19 +7120,19 @@ msgstr ""
 "Paket kurma/kaldırma işlemi şu anda sahip olmadığınız yönetici yetkilerini "
 "gerektirir.  Root kullanıcı hesabına geçmek ister misiniz?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Root ol"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Root olma"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Hiçbir paket kurulmayacak, yükseltilmeyecek ya da kaldırılmayacak."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7176,19 +7142,19 @@ msgstr ""
 "paketler yükseltilebilir, ama onları yükseltmeyi seçmediniz.Yükseltme için "
 "\"U\" tuşuna basın."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Paket listeleri güncelleniyor"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Paket listesi güncelleme durum bilgisi göster"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Liste Güncelleme"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7197,23 +7163,23 @@ msgstr ""
 "yöneticiyetkilerini gerektirir.  Root kullanıcı hesabına geçmek ister "
 "misiniz?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Mayınları bulmaya çalışırken zamanı boşa harcayın"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "İndirme işlemi sürerken temizlemeye izin verilmez."
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Ä°ndirilmiÅŸ dosyalar siliniyor"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Ä°ndirilmiÅŸ paketler silindi."
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7223,18 +7189,18 @@ msgstr ""
 "yöneticiyetkilerini gerektirir.  Root kullanıcı hesabına geçmek ister "
 "misiniz?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "Apt önbellek dosyası mevcut değil; auto-clean yapılamıyor."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "İndirilmiş eski paketler temizleniyor, %sB disk alanı boşaltılacak."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7244,122 +7210,122 @@ msgstr ""
 "yöneticiyetkilerini gerektirir.  Root kullanıcı hesabına geçmek ister "
 "misiniz?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Başka çözüm yok."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Uygulanabilir bir çözüm bulunamadı."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Çözüm bulmaya çalışırken fazla zaman harcandı."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Bağımlılıkları çözümle"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Karşılanmamış bağımlılıklar için çözüm bul"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "%ls açılamıyor"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Çözücü durumu kaydedilirken hata"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "^Paketleri kur/kaldır"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "Paket listesini ^güncelle"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "^Yükseltibilir olanları işaretle"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "Yeni paketleri ^unut"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Bekleyen eylemleri ip^tal et"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "Paket ön^belleğini temizle"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Eski d^osyaları temizle"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "Paket arabelleÄŸini ^yenile"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "Mayın tarlası ^oyna"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Root o^l"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "Çı^k"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Geri al"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "^Kur"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Şu an seçili paketi kurma ya da yükseltme işlemi için işaretle"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^Kaldır"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Şu an seçili paketi kaldırma işlemi için işaretle"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Temizle"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Seçili olan paketi ve yapılandırma dosyalarını kaldırma işlemi için işaretle"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Koru"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Seçili paket üzerindeki işlemleri iptal et"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "^Tut"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7367,11 +7333,11 @@ msgstr ""
 "Seçili paket üzerindeki işlemleri iptal et ve daha sonra yapılacak "
 "yükseltmelerden koru"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "^Otom. Ä°ÅŸaretle"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7379,11 +7345,11 @@ msgstr ""
 "Seçili paketi otomatik kurulmuş olarak işaretle; eğer bu pakete bağımlı bir "
 "paket kalmazsa otomatik olarak kaldırılır"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Elle ^Ä°ÅŸaretle"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7391,11 +7357,11 @@ msgstr ""
 "Seçili paketi el ile kurulmuş olarak işaretle; siz silmek istemediğiniz "
 "sürece kurulu kalacaktır"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "Sürümü ^Engelle"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7403,336 +7369,336 @@ msgstr ""
 "Şu an seçili paketin kurulacak sürümünün kurulmasını engelle; paketin daha "
 "yeni sürümleri alışıldık şekilde kurulacaktır"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "^Bilgi"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Seçilen paket hakkında daha ayrıntılı bilgi göster"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Changelog"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Seçili paketin Debian değişiklik güncesini göster"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "^Çözümü Denetle"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Seçili çözüm ile bağımlılık sorunlarını karşılaştır."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "Çözümü ^Uygula"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Seçili çözümdeki eylemleri gerçekleştir."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "^Sonraki Çözüm"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Bağımlılık sorunları için sonraki çözümü seç."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "^Önceki Çözüm"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Bağımlılık sorunları için önceki çözümü seç."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "^İlk Çözüm"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Bağımlılık sorunları için ilk çözümü seç."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "'Son Çözüm"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "Bağımlılık sorunları için üretilen son çözümü seç."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "^RededilmiÅŸ durumunu deÄŸiÅŸtir"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Seçili eylem rededilmiş olsa bile durumu değiştir."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "^Kabul edilmiÅŸ durumunu deÄŸiÅŸtir"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Şu an seçili işlemin onayla/onaylama."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "Hedefi ^Göster"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Seçili eylemden etkilenecek paketi göster"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Bul"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Ä°leri doÄŸru ara"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "^Geriye DoÄŸru Ara"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Geriye doÄŸru ara"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "^Tekrar Bul"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Son aramayı tekrarla"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 #, fuzzy
 msgid "Find Again ^Backwards"
 msgstr "^Geriye DoÄŸru Ara"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 #, fuzzy
 msgid "Repeat the last search in the opposite direction"
 msgstr "Son aramayı tekrarla"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "Görünümü ^Kısıtla"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "Paket listesini filtrele"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "Görünümü Kısıtla^ma"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Paket listesine uygulanan filtreyi kaldır"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "^Bozukları Bul"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Paket bağımlılığı karşılanamayan sonraki paketi bul"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 #, fuzzy
 msgid "^Preferences"
 msgstr "ÖnBağımlılıklar"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "^Arayüz seçenekleri"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Kullanıcı arayüzünü etkileyen ayarları değiştirir"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Bağımlılık işleme"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Paket bağımlılıklarının işlenmesini etkileyen ayarları değiştirir"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Çeşitli"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Uygulamanın çeşitli ayarlarını değiştirir"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "^Seçenekleri sıfırla"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Tüm ayarları sistem öntanımlı biçimlerine getirir"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Sonraki"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Sonraki ekranı görüntüle"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "Ön^ceki"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Önceki ekranı görüntüle"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "^Kapat"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Bu ekranı kapat"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Yeni paket gö^rünümü"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Yeni bir öntanımlı paket görünümü oluştur"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "^Önerilenleri Denetle"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr "Kurulu olmayan ama kurulacak önerilmiş paketleri göster."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Yeni ^Düz Paket Görünümü"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Sistemdeki tüm paketleri sınıflandırılmamış tek bir listede göster"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Yeni ^Debtags Gezgini"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Paketlere Debtags bilgisine göre gözat"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "Yeni Sınıf Ge^zgini"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Paketleri sınıfa göre gez"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Hakkında"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Bu uygulama hakkındaki bilgileri görüntüle"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "^Yardım"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Çevrimiçi yardımı görüntüle"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "Kulla^nıcı Elkitabı"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Uygulamanın ayrıntılı elkitabını görüntüler"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^SSS"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "^Yenlikler"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 #, fuzzy
 msgid "View the important changes made in each version of "
 msgstr "Her sürümünde yapılmış önemli değişiklikleri görüntüle"
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^Lisans"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Eylemler"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Ara"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Seçenekler"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Görünümler"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7741,11 +7707,11 @@ msgstr ""
 "%ls: Menü  %ls: Yardım  %ls: Çık  %ls: Güncelle  %ls: Paketleri İndir/Kur/"
 "Kaldır"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -7773,10 +7739,42 @@ msgstr "Değişim günlüklerini indirmek için kullanılacak URL(adres)"
 msgid "Downloading the changelog of %s"
 msgstr "Changelog Ä°ndiriliyor"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr ""
-"Sadece resmi Debian paketlerinin değişiklik güncelerini görebilirsiniz."
+#~ msgid "MISSING TAG"
+#~ msgstr "UNUTULMUÅž ETÄ°KET"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "Değişim günlüklerini indirmek için kullanılacak URL(adres)"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s resmi bir Debian paketi değil, değişiklik güncesi gösterilemiyor."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "\"%s\" adında bir paket bulunamıyor"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "%s kalıbı ayrıştırılamıyor"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "-q='dan sonra sayı belirtilmeli\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "-q='dan sonra sayı belirtilmeli, %s kullanılmış\n"
+
+#, fuzzy
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o key=değer şeklinde bir seçenek gerekiyor, %s elde edildi"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "TUHAFLIK: bilinmeyen seçenek kodu alındı\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u ve -i bir komutla birlikte kullanılamaz"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr ""
+#~ "Sadece resmi Debian paketlerinin değişiklik güncelerini görebilirsiniz."
 
 #~ msgid "Err "
 #~ msgstr "Hata"
@@ -7912,11 +7910,6 @@ msgstr ""
 #~ msgstr "Changelog Ä°ndiriliyor"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Çözüm bulunamadı."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "%s paket hiyerarşi dosyası açılamadı"
diff --git a/po/uk.gmo b/po/uk.gmo
index 25111d1a..31558d1f 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index 6a5aa07f..df86baa5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:31+0800\n"
 "Last-Translator: Borys Yanovych <borman@pravex.kiev.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -373,25 +373,10 @@ msgstr ""
 "вказаних в sources.list архівів файли."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "URL дл� завантаженн� �пи�ків змін"
-
-#: src/apt_options.cc:294
-#, fuzzy
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Цей параметр керує шаблонами, що викори�товують�� дл� завантаженн� �пи�ків "
-"змін з веб-�айту Debian.  Змінювати його варто лише в тому випадку, �кщо "
-"змінюєть�� URL архіву пакунків."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Відображати �пи�ок запланованих дій, перед тим �к що�ь здій�нити"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -399,12 +384,12 @@ msgstr ""
 "Якщо цей параметр увімкнено, пі�л� вказівки aptitude про запу�к процедури "
 "в�тановленн�, �першу буде показано огл�д дій, �кі плануєть�� здій�нити."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Забувати про \"нові\" пакунки щоразу пі�л� оновленн� �пи�ків пакунків"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -412,14 +397,14 @@ msgstr ""
 "Якщо цей параметр увімкнено, aptitude очи�тить �пи�ок нових пакунків пі�л� "
 "оновленн� �пи�ків пакунків (нати�канн�м клавіші 'u', наприклад)."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr ""
 "Забувати про \"нові\" пакунки щоразу пі�л� в�тановленн� або видаленн� "
 "пакунків"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -429,14 +414,14 @@ msgstr ""
 "здій�ненн� запу�ку процедури в�тановленн� або видаленн� пакунків з "
 "командного р�дка."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "�е показувати попередженн�, �кщо перша зміна здій�нюєть�� в режимі \"лише "
 "дл� читанн�\""
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -446,12 +431,12 @@ msgstr ""
 "зміни �тану пакунка за від�утно�ті у ва� повноважень на вне�енн� змін в "
 "�и�тему."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "За�терігати при �пробі виконати дію при від�утно�ті потрібних прав (не-root)"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -463,11 +448,11 @@ msgstr ""
 "правами не-root кори�тувача.  Ви матимете можливі�ть зареє�трувати�� �к root "
 "та здій�нити дану дію з необхідними повноваженн�ми."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Журнальний файл дл� реє�трації дій"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -479,11 +464,11 @@ msgstr ""
 "буде �имвол каналу ('%B|%b'), то залишок назви інтерпретуєть�� �к команда "
 "�ценарію, на �тандартний вхід �кого буде перенаправлено �пи�ок дій."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "�втоматично розв'�зувати залежно�ті обраного пакунка"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -496,12 +481,12 @@ msgstr ""
 "може продукувати неоптимальні результати або взагалі не �працьовувати дл� "
 "де�ких випадків."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr ""
 "�втоматично виправл�ти недієздатні пакунки перед в�тановленн�м чи видаленн�м"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -513,11 +498,11 @@ msgstr ""
 "пропозиції розв'�зувача щодо вирішенн� даної проблеми.  Інакше ж aptitude "
 "запропонує вам вирішити недієздатні залежно�ті."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "�втоматично в�тановлювати рекомендовані пакунки"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -536,11 +521,11 @@ msgstr ""
 "видал�ти пакунки що не викори�товують��\", пакунки, котрі рекомендують�� "
 "в�тановленим пакунком автоматично видал�ти�� не будуть."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "�втоматично видал�ти пакунки що не викори�товують��"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -558,11 +543,11 @@ msgstr ""
 "рекомендовані пакунки\", автоматично в�тановлені пакунки не будуть "
 "видал�ти��, котрий�ь з пакунків рекомендує їх."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Пакунки, котрі ніколи не будуть автоматично видаленими"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -572,11 +557,11 @@ msgstr ""
 "ніби �кий�ь зі в�тановлених пакунків залежить від них: вони ніколи не будуть "
 "позначені дл� видаленн� �к такі що не викори�товують��."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -589,17 +574,17 @@ msgid ""
 "or upgrade, due to apt bug #470035."
 msgstr ""
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 #, fuzzy
 msgid "UI options"
 msgstr "�алаштуванн� ІК"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 #, fuzzy
 msgid "Dependency handling"
 msgstr "Обробка залежно�тей"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 #, fuzzy
 msgid "Miscellaneous"
 msgstr "Різне"
@@ -710,7 +695,7 @@ msgstr "�еможливо знайти архів \"%s\" дл� пакунка
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "�еможливо отримати �пи�ок файлів в \"%s\""
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -719,7 +704,7 @@ msgstr ""
 "�отатка: \"%s\", що забезпечує віртуальний пакунок\n"
 "         \"%s\", вже в�тановлено.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -728,7 +713,7 @@ msgstr ""
 "�отатка: \"%s\", що забезпечує віртуальний пакунок\n"
 "         \"%s\", вже вибрано дл� в�тановленн�.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -737,17 +722,23 @@ msgstr ""
 "\"%s\" і�нує в базі даних пакунків, однак не є �правжнім\n"
 "пакунком, а жоден інший пакунок не забезпечує його.\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" є віртуальним пакунком, що забезпечуєть��:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Ви повинні обрати один дл� в�тановленн�\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "Пакунок %s не в�тановлений, тому неможливо заборонити його оновленн�\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -756,62 +747,55 @@ msgstr ""
 "�отатка: обрано \"%s\" замі�ть\n"
 "         віртуального пакунка \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s вже в�тановлено потрібної вер�ії (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s не в�тановлений, тому його перев�тановленн� неможливе.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s вже в�тановлено потрібної вер�ії (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s не в�тановлений, тому його перев�тановленн� неможливе.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Пакунок %s не в�тановлений, тому видалити його неможливо\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Пакунок %s не в�тановлений, тому неможливо заборонити його оновленн�\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Пакунок %s не оновлюваний, тому неможливо заборонити його оновленн�\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "�отатка: вибрано задачу \"%s: %s\" дл� в�тановленн�\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Ви можете вказувати вер�ію пакунка лише дл� команд 'install' та 'forbid-"
-"version'.\n"
+"version'"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "Ви можете вказувати архів пакунків лише дл� команди 'install'.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "Ви можете вказувати архів пакунків лише дл� команди 'install'"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -820,7 +804,7 @@ msgstr ""
 "�е вдало�� знайти пакунок \"%s\", але \"%s\" мі�тить��\n"
 "в назвах більш ніж 40-ка пакунків\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -829,13 +813,13 @@ msgstr ""
 "�е вдало�� знайти пакунок \"%s\". Проте, \"%s\" мі�тить��\n"
 "в назвах таких пакунків:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 "�е вдало�� знайти жодного пакунка, в назві або опи�і �кого мі�тить�� \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -853,7 +837,7 @@ msgstr ""
 "�е вдало�� знайти пакунок, в назві �кого мі�тить�� \"%s\".\n"
 "Проте \"%s\" знайдено в опи�ах таких пакунків:\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "�евірний �имвол вибору дії: '%c'\n"
@@ -876,100 +860,85 @@ msgstr "Пмл "
 msgid "Changelog download failed: %s"
 msgstr "Спи�ок змін дл� %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "�е вдало�� запу�тити перегл�дач, це дій�но працездатна Debian-�и�тема?"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "%s не є офіційним пакунком Debian, неможливо показати його changelog."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "�е вдало�� знайти changelog дл� %s"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "�е вдало�� знайти changelog дл� %s"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: Команді clean аргументи не потрібні\n"
+msgid "The clean command takes no arguments"
+msgstr "Команді clean аргументи не потрібні"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "Видал %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr "�е вдало�� знайти вашу домашню теку, збереженн� в /tmp/function_pkgs!"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Видал %s %s [%sb]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: Команді autoclean аргументи не потрібні\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "Команді autoclean аргументи не потрібні"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Звільнить�� %sb ди�кового про�тору\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "Звільнено %sb ди�кового про�тору\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Помилкова ді� %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "�еочікуваний аргумент шаблону пі�л� \"keep-all\""
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, fuzzy, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+#, fuzzy
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr "�е вдаєть�� розв'�зати залежно�ті дл� оновленн� (%s)."
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Перервати.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
+msgid "download: you must specify at least one package to download"
 msgstr ""
-"завантаженн�: ви повинні дати вказівку на завантаженн� хоча б одного "
-"пакунка\n"
+"завантаженн�: ви повинні дати вказівку на завантаженн� хоча б одного пакунка"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "�е вдало�� прочитати sources.list"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "�е вдало�� знайти пакунок з назвою \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -1009,30 +978,23 @@ msgid "[Working]"
 msgstr "[Обробка]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "�еможливо знайти пакунок \"%s\""
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
+#, fuzzy
+#| msgid "E: The forget-new command takes no arguments\n"
+msgid "The forget-new command takes no arguments"
 msgstr "E: Команді forget-new аргументи не потрібні\n"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Забути про те �кі пакунки є новими\n"
@@ -1141,17 +1103,17 @@ msgstr "�а�тупні пакунки будуть оновлені:"
 msgid "The following partially installed packages will be configured:"
 msgstr "�а�тупні ча�тково в�тановлені пакунки будуть налаштовані:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "�а�тупні �ЕВІДДІЛЬ�І пакунки будуть ВИД�ЛЕ�І!\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Вна�лідок цієї дії �тануть �ЕДІЄЗД�Т�ИМИ такі �ЕВІДДІЛЬ�І пакунки:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1160,16 +1122,16 @@ msgstr ""
 "ПОПЕРЕДЖЕ��Я: Виконанн� цієї дії може пошкодити вашу �и�тему!\n"
 "              ЗУПИ�ІТЬСЯ, �кщо ви не знаєте ТОЧ�О, що ви робите!\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Я знаю, що це дуже погана іде�"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "Щоб продовжити, наберіть фразу \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1186,7 +1148,7 @@ msgstr ""
 "�відомі вла�них намірів.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1196,7 +1158,7 @@ msgstr ""
 "                       %s::CmdLine::Ignore-Trust-Violations має значенн� "
 "'true'!\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1209,7 +1171,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1218,100 +1180,100 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Бажаєте ігнорувати це попередженн� і в�е одно продовжити?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "Дл� продовженн� введіть \"%s\"; введіть \"%s\", щоб перервати проце�: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr ""
 "�еможливо розпізнати введу фразу. Вимагаєть�� лише \"%s\" або \"%s\".\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr ""
 "�а�тупні пакунки РЕКОМЕ�ДУЮТЬСЯ, однак �Е будуть в�тановлені автоматично:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 "�а�тупні пакунки ПРОПО�УЮТЬСЯ, однак �Е будуть в�тановлені автоматично:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Жодного не буде в�тановлено, оновлено або видалено.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu пакунків оновлено, %lu нових в�тановлено, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu перев�тановлено, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu замінено на давніші вер�ії, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu видалено і %lu не оновлено.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Потрібно отримати %sb/%sb архівів. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Потрібно отримати %sb архівів. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Пі�л� розпакуванн� %sb буде зайн�то.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Пі�л� розпакуванн� буде звільнено %sb.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "�емає пакунків дл� показу -- введіть назви пакунків в р�дку пі�л� 'i'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "�ати�ніть Enter дл� продовженн�."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "Пакунків не знайдено -- введіть назви пакунків в р�дку пі�л� 'c'.\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1320,30 +1282,30 @@ msgstr ""
 "Пакунків не знайдено -- дл� підтвердженн� введіть нуль або більше коренів "
 "пошуку пі�л� назви пакунка.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "продовжити з в�тановленн�м"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "перервати та вийти"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
@@ -1351,12 +1313,12 @@ msgstr ""
 "показати інформацію про один або декілька пакунків; назви пакунків треба "
 "вказувати пі�л� 'i'"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1364,39 +1326,39 @@ msgstr ""
 "показати �пи�ок змін Debian дл� одного або декількох пакунків; назви "
 "пакунків треба вказувати пі�л� 'c'"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "перемкнути�ь на відображенн� інформації про залежно�ті"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "перемкнути�ь на відображенн� змін в розмірах пакунків"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "перемкнути�ь на відображенн� номерів вер�ій"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1404,27 +1366,27 @@ msgstr ""
 "�пробувати визначити причину в�тановленн� конкретного пакунка або по��ненн� "
 "чому в�тановленн� одного пакунка призводить до в�тановленн� іншого."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "запу�тити автоматичний розв'�зувач залежно�тей дл� виправленн� пошкоджених "
 "залежно�тей"
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "увійти до повноекранного візуального інтерфей�у"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1436,46 +1398,46 @@ msgstr ""
 "(можна вказувати і шаблони). Ц� ді� буде виконана дл� в�іх пакунків з вашого "
 "�пи�ку. Можливі варіанти дій:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "'+' в�тановити пакунки"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "'+M' в�тановити пакунки та одразу позначити їх �к автоматично в�тановлені"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "'-' видалити пакунки"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "'_' очи�тити пакунки"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "'=' зафік�увати пакунки"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "':' зберегти пакунки в їх поточному �тані не фік�уючи їх"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "'&M' позначити пакунки �к автоматично в�тановлені"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "'&m' позначити пакунки �к в�тановлені вручну"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1483,29 +1445,29 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "'&M' позначити пакунки �к автоматично в�тановлені"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Команди:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1513,21 +1475,21 @@ msgstr ""
 "Пошук вирішенн� даних залежно�тей завершив�� невдачею.  Ви можете �пробувати "
 "розв'�зати їх �амо�тійно або вийти, нати�нувши 'n'."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Бажаєте продовжити? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Розв'�зати дані залежно�ті вручну? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "Помилкова відповідь. Введіть правильну команду або нати�ніть '?' дл� "
 "довідки.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1536,7 +1498,7 @@ msgstr ""
 "в�тановленн� пакунка), 'R' щоб �пробувати розв'�зати залежно�ті автоматично "
 "або 'N' дл� припиненн� дії."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1547,7 +1509,7 @@ msgstr ""
 "Інформаці� про залежно�ті буде відображати��.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1558,7 +1520,7 @@ msgstr ""
 "Інформаці� про залежно�ті відображати�� не буде.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1569,7 +1531,7 @@ msgstr ""
 "�омера вер�ій будуть відображати��.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1580,7 +1542,7 @@ msgstr ""
 "�омера вер�ій відображати�� не будуть.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1591,7 +1553,7 @@ msgstr ""
 "Інформаці� про зміни розмірів буде відображати��.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1726,6 +1688,11 @@ msgstr "ОчікуєтьÑ�Ñ� Ñ�к мінімум одна пара пакуноÐ
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "Очікуєть�� вер�і� пі�л� \"%s\""
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "�еможливо знайти пакунок \"%s\""
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1875,7 +1842,7 @@ msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 "Я хочу розв'�зати залежно�ті, проте розв'�зувача залежно�тей не �творено."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1903,7 +1870,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Придатними є на�тупні команди:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Файл дл� запи�у �тану розв'�зувача:"
 
@@ -1936,7 +1903,7 @@ msgstr ""
 "***ПОМИЛК�: пошук перервано вна�лідок фатального вин�тку.\n"
 "           Ви можете продовжити, проте де�кі вирішенн� будуть недо�тупними."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1945,25 +1912,24 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "�е вдало�� розв'�зати залежно�ті дл� оновленн� (рішень не знайдено)."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "�е вдаєть�� розв'�зати залежно�ті дл� оновленн� (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "iconv дл� %s завершив�� невдачею.\n"
+msgid "iconv of %s failed"
+msgstr "iconv дл� %s завершив�� невдачею"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "пошук: Ви повинні вве�ти хоча б одне �лово дл� пошуку\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "пошук: Ви повинні вве�ти хоча б одне �лово дл� пошуку"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2006,7 +1972,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "�а�тупні пакунки мають незадоволені залежно�ті:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2229,7 +2195,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Забезпечує"
 
@@ -2243,15 +2209,9 @@ msgstr "Опи�: "
 msgid "Homepage: "
 msgstr "Домівка: "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "�еможливо знайти пакунок %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "�е вдало�� проаналізувати шаблон %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "�е знайдено жодного пакунка"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2262,14 +2222,13 @@ msgstr "Завантажити/вÑ�тановити/видалити пакунÐ
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Внутрішн� помилка, впор�дкуванн� не завершене"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "Видаленн� за�тарілих завантажених файлів"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: Команді update аргументи не потрібні\n"
+msgid "The update command takes no arguments"
+msgstr "Команді update аргументи не потрібні"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, fuzzy, c-format
@@ -2286,43 +2245,37 @@ msgstr "Ð�еможливо знайти верÑ�Ñ–ÑŽ \"%s\" длÑ� пакункÐ
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "�е знайдено придатної вер�ії дл� %s\n"
+msgid "No candidate version found for %s"
+msgstr "�е знайдено придатної вер�ії дл� %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "�е знайдено поточної або придатної вер�ії дл� %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "�е знайдено поточної або придатної вер�ії дл� %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "�еможливо знайти архів \"%s\" дл� пакунка \"%s\"\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "�еможливо знайти архів \"%s\" дл� пакунка \"%s\""
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "�еможливо знайти вер�ію \"%s\" дл� пакунка \"%s\"\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "�еможливо знайти вер�ію \"%s\" дл� пакунка \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
 msgstr ""
-"Внутрішн� помилка: в cmdline_find_ver передано неправильне значенн� %i!\n"
-
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Ви не можете вказувати архів та вер�ію пакунка одноча�но\n"
+"Внутрішн� помилка: в cmdline_find_ver передано неправильне значенн� %i!"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "�е вдало�� знайти changelog дл� %s"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Ви не можете вказувати архів та вер�ію пакунка одноча�но"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
@@ -2330,7 +2283,7 @@ msgstr[0] "%d недієздатний [%+d]"
 msgstr[1] "%d недієздатних [%+d]"
 msgstr[2] "%d недієздатні [%+d] "
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
@@ -2338,7 +2291,7 @@ msgstr[0] "%d оновлений [%+d]"
 msgstr[1] "%d оновлених [%+d]"
 msgstr[2] "%d оновлені [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
@@ -2346,12 +2299,12 @@ msgstr[0] "%d новий [%+d]"
 msgstr[1] "%d нових [%+d]"
 msgstr[2] "%d нові [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
@@ -2359,7 +2312,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
@@ -2367,57 +2320,85 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr ""
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "�еможливо знайти пакунок %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "�е вдало�� знайти changelog дл� %s"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "�отатка: вибрано задачу \"%s: %s\" дл� в�тановленн�\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "�е вдало�� знайти changelog дл� %s"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Пакунки"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Джерельний пакунок: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "�рхів"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "пошук: Ви повинні вве�ти хоча б одне �лово дл� пошуку\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2443,7 +2424,7 @@ msgstr ""
 msgid "Candidate"
 msgstr "МожлВер�"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "В�тановити"
 
@@ -2549,22 +2530,20 @@ msgstr "�е вдало�� знайти розв'�зок, �кий можна
 msgid "Packages requiring %s:"
 msgstr "Пакунки, що залежать від %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Пакунка з назвою \"%s\" не і�нує."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "�е вдало�� до�лідити де�кі шаблони відповідно�ті."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr ""
-"%s: ц� команда потребує хоча б одного аргументу (назви пакунка дл� запиту).\n"
+"%s: ц� команда потребує хоча б одного аргументу (назви пакунка дл� запиту)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2590,12 +2569,12 @@ msgstr ""
 msgid "UNAVAILABLE"
 msgstr "�ЕДОСТУП�О"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 #, fuzzy
 msgid "Tags"
 msgstr "Мітка"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr ""
 
@@ -2800,31 +2779,31 @@ msgstr ""
 "�е вдаєть�� заблокувати файл кешу. Відкриваю в режимі лише дл� читанн�; будь-"
 "�кі вне�ені вами зміни �танів пакунків �Е БУДУТЬ збережені!"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 msgid "allowed"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "main"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2891,35 +2870,43 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr "Кеш пакунків недо�тупний; неможливо завантажити та в�тановити пакунки."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr ""
 "Внутрішн� помилка: не вдало�� згенерувати �пи�ок пакунків дл� завантаженн�"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "�е вдало�� �т�гнути %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"�еможливо завантажити де�кі архіви, імовірно треба виконати aptitude update "
+"або �пробувати повторити запу�к з ключем --fix-missing?"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "�еможливо виправити дл� недо�тупних пакунків"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Помилка під ча� в�тановленн� пакунка. Спроба відновленн�:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3071,13 +3058,13 @@ msgstr ""
 "\n"
 "Кінець журналу.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "Завантаженн� пакунків"
@@ -3188,18 +3175,18 @@ msgstr ""
 "Індек�ні файли пакунків пошкоджені. �е знайдено пол� Filename: дл� пакунка "
 "%s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Спи�ок змін дл� %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "URL дл� завантаженн� �пи�ків змін"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "URL дл� завантаженн� �пи�ків змін"
@@ -3249,26 +3236,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "�е вдало�� проаналізувати шаблон %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "Створенн� бази даних міток"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "�е в�тановлений"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "�е в�тановлений"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3416,40 +3404,40 @@ msgstr ""
 msgid "_File"
 msgstr "False"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Виконати в�і незавершені в�тановленн� та видаленн�"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Перевірити до�тупні�ть нових вер�ій пакунків"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "Позначити дл� оновленн� в�і незафік�овані пакунки"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Забути про те, �кі пакунки є \"новими\""
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 "Ска�увати в�і незавершені в�тановленн�, видаленн�, фік�уванн� та оновленн�."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Видалити попередньо завантажені файли пакунків"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Видалити файли пакунків, �кі більше недо�тупні дл� завантаженн�"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Перезавантажити кеш пакунків."
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3459,7 +3447,7 @@ msgstr ""
 "Запу�к 'su' дл� отриманн� прав �уперкори�тувача; програма буде перезапущена, "
 "однак ваші налаштуванн� збережуть��"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Завершити роботу програми"
 
@@ -3467,7 +3455,7 @@ msgstr "Завершити роботу програми"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Відмінити о�танню операцію з пакунком або групу операцій"
 
@@ -3501,7 +3489,7 @@ msgid "_Help"
 msgstr "Допомога"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3510,19 +3498,19 @@ msgstr ""
 msgid "Update"
 msgstr "Оновленн� �пи�ку"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Пакунки"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Огл�д"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Розв'�зувач"
 
@@ -3709,7 +3697,7 @@ msgid "Fix Manually"
 msgstr "Довідник"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Оновити"
 
@@ -4248,11 +4236,11 @@ msgstr "В�тановлений"
 msgid "Reinstall"
 msgstr "Перев�тановити"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Замінити на більш давній"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "Видалити"
 
@@ -4288,7 +4276,7 @@ msgstr "За�то�увати фільтр до �пи�ку пакунків"
 msgid "Download already running."
 msgstr "Завантаженн�..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Оновленн� �пи�ків пакунків або в�тановленн� вже провод�ть��."
 
@@ -4349,26 +4337,26 @@ msgstr "'-' видалити пакунки"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "�еможливо замінити %s новим файлом налаштувань"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "Завантаженн� пакунків"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "'-' видалити пакунки"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "'-' видалити пакунки"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "Розв'�зати залежно�ті"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
@@ -4376,12 +4364,12 @@ msgstr[0] "В�і пакунки є дієздатними."
 msgstr[1] "В�і пакунки є дієздатними."
 msgstr[2] "В�і пакунки є дієздатними."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s змін"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s змін"
@@ -4389,7 +4377,7 @@ msgstr "%s змін"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4400,7 +4388,7 @@ msgstr[2] "%d в�тановити"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
@@ -4408,57 +4396,57 @@ msgstr[0] "не вдало�� видалити %s"
 msgstr[1] "не вдало�� видалити %s"
 msgstr[2] "не вдало�� видалити %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "DownloadSize"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "не в�тановлений"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "В�тановлений"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "Очи�тити"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Зберегти"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Зафік�увати"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "Довідник кори�тувача"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4496,7 +4484,7 @@ msgstr "ні"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4541,17 +4529,17 @@ msgstr "%s; буде в�тановлений автоматично"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "Пошук"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "Створенн� пред�тавлень"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "Створенн� пред�тавлень"
@@ -5271,114 +5259,115 @@ msgstr "�евідомий тип вирівнюванн� '%s'"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Правилам �ортуванн� \"за назвою\" аргументи не потрібні"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Порожн� назва правила �ортуванн� неприпу�тима"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "�евідповідна '(' в опи�і правила �ортуванн�"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "�евірний тип правила �ортуванн� '%s'"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "�е вдало�� декодувати багатобайтовий р�док пі�л� \"%ls\""
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 "�е вдало�� декодувати р�док широкоформатних �имволів (wide-character) \"%s\""
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s �компільовано о %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Компіл�тор: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 #, fuzzy
 msgid "Compiled against:\n"
 msgstr "Компіл�тор: g++ %s\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, fuzzy, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "Зберегти %F вер�ії %s (%s)"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, fuzzy, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 "\n"
 "Вер�і� NCurses: %s\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, fuzzy, c-format
 msgid "  NCurses version %s\n"
 msgstr ""
 "\n"
 "Вер�і� NCurses: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, fuzzy, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "Вер�і� libsigc++: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, fuzzy, c-format
 msgid "  Ept support enabled.\n"
 msgstr "Підтримка ept увімкнена.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, fuzzy, c-format
 msgid "  Ept support disabled.\n"
 msgstr "Підтримка ept вимкнена.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "Зберегти %F вер�ії %s (%s)"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "Зберегти %F вер�ії %s (%s)"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "Підтримка ept вимкнена.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s �компільовано о %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 msgid "  Qt support disabled.\n"
 msgstr "Підтримка ept вимкнена.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 #, fuzzy
 msgid ""
 "\n"
@@ -5387,36 +5376,36 @@ msgstr ""
 "\n"
 "Вер�і� Curses: %s\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, fuzzy, c-format
 msgid "  NCurses version: %s\n"
 msgstr ""
 "\n"
 "Вер�і� NCurses: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, fuzzy, c-format
 msgid "  cwidget version: %s\n"
 msgstr "Вер�і� libsigc++: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, fuzzy, c-format
 msgid "  Apt version: %s\n"
 msgstr ""
 "\n"
 "Вер�і� Curses: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Викори�танн�: aptitude [-S назва_файлу] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [параметри] <ді�> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5425,42 +5414,42 @@ msgstr ""
 "  Ді� (�кщо її не задати, aptitude запу�тить�� в інтерактивному режимі):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - В�тановити/оновити пакунки.\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Видалити пакунки.\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Видалити пакунки і їх конфігураційні файли.\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Зафік�увати пакунки.\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - Ска�увати команду hold дл� пакунка.\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - Позначити пакунок �к автоматично в�тановлений.\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - Позначити пакунок �к в�тановлений вручну.\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5468,17 +5457,17 @@ msgid ""
 msgstr ""
 " forbid-version - Заборонити aptitude оновлювати вказану вер�ію пакунка.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Завантажити �пи�ки нових/оновлених пакунків.\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - Виконати безпечне оновленн�.\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5487,52 +5476,52 @@ msgstr ""
 " full-upgrade - Виконати оновленн�, дозвол�єть�� в�тановленн� та видаленн� "
 "пакунків.\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Забути про те �кі пакунки є \"новими\".\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - Пошук пакунка по назві та/або виразу.\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Показати детальну інформацію про пакунок.\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - Показати детальну інформацію про пакунок\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Стерти завантажені файли пакунків.\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Стерти �тарі завантажені файли пакунків.\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Перегл�нути �пи�ок змін пакунка.\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - Завантажити .deb-файл пакунка.\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5541,7 +5530,7 @@ msgstr ""
 " reinstall    - Завантажити і (можливо) перев�тановити вже в�тановлений "
 "пакунок.\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5549,7 +5538,7 @@ msgid ""
 "                why one or more packages would require the given package.\n"
 msgstr ""
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5558,44 +5547,44 @@ msgid ""
 "                lead to a conflict with the given package if installed.\n"
 msgstr ""
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Параметри:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             Цей допоміжний тек�т.\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             Цей допоміжний тек�т\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             Імітувати дій, але не виконувати їх на�правді.\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
@@ -5603,12 +5592,12 @@ msgstr ""
 " -d             Лише завантажити пакунки, нічого не в�тановлювати і не "
 "видал�ти.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Завжди запитувати підтвердженн� дій.\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5616,7 +5605,7 @@ msgstr ""
 " -y             Вважати що відповіддю на про�ті запитанн� (yes/no) буде "
 "'yes'.\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5625,7 +5614,7 @@ msgstr ""
 " -F format      Вказати формат відображенн� результатів пошуку; див. "
 "підручник.\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5634,24 +5623,24 @@ msgstr ""
 " -O order       Вказати формат �ортуванн� результатів пошуку; див. "
 "підручник.\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr ""
 " -w width       Вказати ширину виводу дл� форматуванн� результатів пошуку.\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Приму�ово намагати�ь виправити недієздатні пакунки.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Показувати �кі вер�ії пакунків в�тановлюють��.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -5659,13 +5648,13 @@ msgstr ""
 " -D             Показувати залежно�ті пакунків, �тан �ких був змінений "
 "автоматично.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 " -Z             Показувати зміну розміру дл� кожного в�тановленого пакунка.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5674,14 +5663,14 @@ msgstr ""
 " -v             Показувати додаткову інформацію. (можна вказувати "
 "багаторазово).\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr ""
 " -t [випу�к]    Задати випу�к, з �кого потрібно в�тановлювати пакунки.\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
@@ -5689,13 +5678,13 @@ msgid ""
 msgstr ""
 " -q             В режимі командного р�дка не показувати індикатор прогре�у.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o key=val     �апр�му задати конфігураційний параметр з назвою 'key'.\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5704,160 +5693,140 @@ msgstr ""
 " --with(out)-recommends\tВказати, вважати чи ні рекомендації �трогими\n"
 "                залежно�т�ми.\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S назва_файлу Читати інформацію про розширений �тан з вказаного файлу.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Завантажити нові �пи�ки пакунків при запу�ку.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, c-format
 msgid "                  (terminal interface only)\n"
 msgstr ""
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Запу�тити в�тановленн� при запу�ку.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  Aptitude не наділена �илою SuperCow.\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 msgid "trace"
 msgstr "True"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 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:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 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:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "False"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Помилкова ді� %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "Пі�л� -q= очікуєть�� чи�ло\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "Пі�л� -q= очікуєть�� чи�ло, отримано %s\n"
-
-#: src/main.cc:798
-#, fuzzy, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o вимагає аргумент у вигл�ді ключ=значенн�, отримано %s"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
 msgstr ""
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "ДИВИ��: отримано невідомий код параметру\n"
-
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "Пакунок"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "Пакунки"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5865,38 +5834,33 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Дозвол�єть�� вказувати лише один з параметрів -u або -i\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "-u та -i не можна вказувати в режимі командного р�дка (наприклад, з "
 "'install')"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "-u та -i не можна викори�товувати разом з командою"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "�евідома команда \"%s\"\n"
+msgid "Unknown command \"%s\""
+msgstr "�евідома команда \"%s\""
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "�еоброблене виключенн�: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, fuzzy, c-format
 msgid ""
 "Backtrace:\n"
@@ -5915,7 +5879,7 @@ msgstr "Пошук вперед"
 msgid "Search backwards for: "
 msgstr "Зворотній пошук: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Сапер"
 
@@ -6128,7 +6092,7 @@ msgstr "Кодуванн� mine-help.txt|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Пакунок"
 
@@ -6209,8 +6173,8 @@ msgstr "<�/Д>"
 msgid "<none>"
 msgstr "<none>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "віртуальний"
@@ -6345,7 +6309,7 @@ msgid "Internal error: Default column string is unparsable"
 msgstr ""
 "Внутрішн� помилка: �еможливо проаналізувати �товпчик р�дка за замовчанн�м"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Завданн�"
 
@@ -6493,21 +6457,17 @@ msgstr ""
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
 "database is not present (installing debtags may correct this problem)."
 msgstr ""
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "ПРОПУЩЕ�� МІТК�"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Джерельний пакунок: "
@@ -7137,7 +7097,7 @@ msgstr "Завантаженн� кешу"
 msgid "Really quit Aptitude?"
 msgstr "Завершити роботу Aptitude?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Змінити поведінку aptitude."
 
@@ -7218,7 +7178,7 @@ msgstr ""
 msgid "License"
 msgstr "Ліцензі�"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 "Показати умови, згідно з �кими ви можете копіювати та розпов�юджувати "
@@ -7241,7 +7201,7 @@ msgstr "Онлайн-довідка"
 msgid "View a brief introduction to aptitude"
 msgstr "Перегл�нути короткий огл�д aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Допомога"
 
@@ -7270,7 +7230,7 @@ msgstr "Довідник"
 msgid "FAQ"
 msgstr "ЧаПи"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Перегл�нути �пи�ок ча�тих питань."
 
@@ -7311,15 +7271,15 @@ msgstr ""
 "бажаєте ви видалити цю теку та ве�ь її вмі�т? Якщо ви виберете відповідь "
 "'�і', то це повідомленн� виводити�ь більше не буде."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Відображати прогре� у завантаженні пакунків"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Завантаженн� пакунків"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7331,37 +7291,37 @@ msgstr ""
 "в�тановленн� лише в тому випадку, �кщо точно знаєте що �аме це вам потрібно."
 "%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [вер�і� %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 #, fuzzy
 msgid "Really Continue"
 msgstr "Завершити роботу Aptitude?"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 #, fuzzy
 msgid "Abort Installation"
 msgstr "�е в�тановлений"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Огл�д пакунків, призначених дл� в�тановленн�"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Перегл�нути та/або погодити дії, �кі будуть виконані"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Були виправлені де�кі недієздатні пакунки:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Розв'�зку даної проблеми з залежно�т�ми немає!"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7370,7 +7330,7 @@ msgstr ""
 "Пошук розв'�занн� залежно�тей вийшов за в�тановлені ча�ові рамки (нати�ніть "
 "\"%s\" щоб �пробувати ретельніше)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7378,21 +7338,21 @@ msgstr ""
 "Дл� в�тановленн�/видаленн� пакунків потрібні адміні�тративні привілеї, �кими "
 "ви на разі не володієте. Чи бажаєте ви перевтілити�ь в кори�тувача root?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 #, fuzzy
 msgid "Become root"
 msgstr "Стати кори�тувачем root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 #, fuzzy
 msgid "Don't become root"
 msgstr "Стати кори�тувачем root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "�емає пакунків, позначених дл� в�тановленн�, видаленн� чи оновленн�."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7402,19 +7362,19 @@ msgstr ""
 "пакунки можуть бути оновлені, однак ви не про�или оновити їх. �ати�ніть \"U"
 "\", щоб в�тановити відповідні позначки дл� оновленн� пакунків."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "Оновленн� �пи�ків пакунків"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Показувати хід оновленн� �пи�ку пакунків"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Оновленн� �пи�ку"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7422,23 +7382,23 @@ msgstr ""
 "Дл� оновленн� �пи�ків пакунків потрібні адміні�тративні привілеї, �кими ви "
 "на разі не володієте. Чи бажаєте ви перевтілити�ь в кори�тувача root?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Вбивайте ча� в пошуках мін"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Очищенн� під ча� проце�у завантаженн� неможливе"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "Видаленн� завантажених файлів"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Завантажені файли були видалені"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7447,11 +7407,11 @@ msgstr ""
 "Дл� оновленн� �пи�ків пакунків потрібні адміні�тративні привілеї, �кими ви "
 "на разі не володієте. Чи бажаєте ви перевтілити�ь в кори�тувача root?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "Файл кешу apt недо�тупний; неможливо виконати auto-clean."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7460,7 +7420,7 @@ msgstr ""
 "За�тарілі завантажені файли пакунків були видалені, вивільнило�ь %sb "
 "ди�кового про�тору."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7469,122 +7429,122 @@ msgstr ""
 "Дл� оновленн� �пи�ків пакунків потрібні адміні�тративні привілеї, �кими ви "
 "на разі не володієте. Чи бажаєте ви перевтілити�ь в кори�тувача root?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Більше розв'�зків немає."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "�е вдало�� знайти розв'�зок, �кий можна було б за�то�увати."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Спроба пошуку розв'�зку вийшла за в�тановлені ча�ові рамки."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Розв'�зати залежно�ті"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Знайти розв'�зки з незадоволеними залежно�т�ми"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "�еможливо відкрити %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Помилка під ча� �киданн� �тану розв'�зувача"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "В�тановити/видалити пакунки"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "Оновити �пи�ок пакунків"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Позначити дл� оновленн�"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "Забути про нові пакунки"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "Ска�увати в�і незавершені дії"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "Очи�тити кеш пакунків"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Очи�тити за�тарілі файли"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "Перезавантажити кеш пакунків"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "Грати в �апера"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Стати кори�тувачем root"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "Вихід"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Відмінити"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "В�тановити"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "Позначити вибраний пакунок дл� в�тановленн� або оновленн�"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "Видалити"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "Позначити вибраний пакунок дл� видаленн�"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "Очи�тити"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 "Позначити вибраний пакунок дл� видаленн� разом з його файлами налаштувань"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "Зберегти"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Ска�увати в�і дії над вибраним пакунком"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "Зафік�увати"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7592,11 +7552,11 @@ msgstr ""
 "Ска�увати в�і дії над вибраним пакунком і захи�тити його від майбутніх "
 "оновлень"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Позначити �к авт.в�тановлений"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7604,11 +7564,11 @@ msgstr ""
 "Позначити вибраний пакунок �к в�тановлений автоматично; �кщо не залишить�� "
 "пакунків, котрі залежать від нього, цей пакунок буде автоматично видалений"
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Позначити �к в�тановлений вручну"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7616,11 +7576,11 @@ msgstr ""
 "Позначити вибрані пакунки �к в�тановлені вручну; вони не будуть видалені "
 "доти, доки ви вручну не зробите цього"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "Заборонити вер�ію"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7628,246 +7588,246 @@ msgstr ""
 "Заборонити в�тановленн� до�тупної вер�ії вибраного пакунка; новіші його "
 "вер�ії будуть в�тановлювати�ь �к і звичайно"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "Інформаці�"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Показати більше інформації про виділений пакунок"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr ""
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^ChangeLog"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Показати �пи�ок змін дл� вибраного пакунка Debian"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "Розгл�нути розв'�зок"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Розгл�нути поточний розв'�зок проблем з залежно�т�ми."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "За�то�увати розв'�зок"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Виконати дії, що мі�т�ть�� у вибраному на даний момент розв'�зку."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "�а�тупний розв'�зок"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Вибрати на�тупний розв'�зок проблем з залежно�т�ми."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "Попередній розв'�зок"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Вибрати попередній розв'�зок проблем з залежно�т�ми."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "Перший розв'�зок"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Вибрати перший розв'�зок проблем з залежно�т�ми."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "О�танній розв'�зок"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "Вибрати о�танній знайдений розв'�зок проблем з залежно�т�ми."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "В�тановити �ка�уванн�"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "В�тановити, що вибрана на даний момент ді� �ка�овуєть��."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "В�тановити �хваленн�"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "В�тановити, що вибрана на даний момент ді� �хвалюєть��."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "Показати ціль"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Показати пакунок, на �кий буде впливати обрана ді�"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr ""
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr ""
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "Пошук"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Пошук вперед"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "Зворотній пошук"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Пошук назад"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Знайти знову"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Повторити о�танній пошук"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Зворотній пошук"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Повторити о�танній пошук у протилежному напр�мку"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "Обмеженн� виводу"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "За�то�увати фільтр до �пи�ку пакунків"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "Вивід без обмежень"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Зн�ти фільтр зі �пи�ку пакунків"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Знайти недієздатні"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Знайти на�тупний пакунок з незадоволеними залежно�т�ми"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "Вподобанн�"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "�алаштуванн� ІК"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Змінити налаштуванн� інтерфей�у кори�тувача"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "Обробка залежно�тей"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Змінити налаштуванн�, що мають відношенн� до обробки залежно�тей"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "Різне"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Змінити різноманітні налаштуванн� програми"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "Скинути опції"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Скинути в�і налаштуванн� до значень за замовчанн�м"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "�а�тупне"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Виве�ти на�тупне вікно"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "Попереднє"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Виве�ти попереднє вікно"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "Закрити"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "Закрити цей перегл�д"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "�ове пред�тавленн� пакунків"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Створити нове звичне візуальне пред�тавленн� пакунків"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Перевірка рекомендацій"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
@@ -7875,98 +7835,98 @@ msgstr ""
 "Перегл�д пакунків, �кі рекомендовані дл� в�тановленн�, однак ще не "
 "в�тановлені."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "�овий пло�кий �пи�ок пакунків"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Показати в�і пакунки в �и�темі одним нероздільним �пи�ком"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "�овий перегл�дач Debtags"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Перегл�д пакунків з викори�танн�м даних Debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "�овий перегл�дач по категорі�х"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Перегл�д пакунків згідно до їх категорій"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "Щодо"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Показати інформацію про дану програму"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "Допомога"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Показати інтерактивну довідку"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "Довідник кори�тувача"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Показати детальний довідник програми"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "ЧаПи"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "�овини"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Показати важливі зміни, зроблені в кожній вер�ії "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "Ліцензі�"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Дії"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Пошук"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Параметри"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Пред�тавленн�"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr ""
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "yes_key"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "no_key"
 
@@ -7994,9 +7954,51 @@ msgstr "URL дл� завантаженн� �пи�ків змін"
 msgid "Downloading the changelog of %s"
 msgstr "Завантаженн� �пи�ку змін"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Спи�ок змін можна перегл�нути лише дл� офіційних пакунків Debian."
+#~ msgid "MISSING TAG"
+#~ msgstr "ПРОПУЩЕ�� МІТК�"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "URL дл� завантаженн� �пи�ків змін"
+
+#, fuzzy
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Цей параметр керує шаблонами, що викори�товують�� дл� завантаженн� "
+#~ "�пи�ків змін з веб-�айту Debian.  Змінювати його варто лише в тому "
+#~ "випадку, �кщо змінюєть�� URL архіву пакунків."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s не є офіційним пакунком Debian, неможливо показати його changelog."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "�е вдало�� знайти пакунок з назвою \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "�е вдало�� проаналізувати шаблон %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "Пі�л� -q= очікуєть�� чи�ло\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "Пі�л� -q= очікуєть�� чи�ло, отримано %s\n"
+
+#, fuzzy
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o вимагає аргумент у вигл�ді ключ=значенн�, отримано %s"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "ДИВИ��: отримано невідомий код параметру\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "-u та -i не можна викори�товувати разом з командою"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Спи�ок змін можна перегл�нути лише дл� офіційних пакунків Debian."
 
 #~ msgid "Err "
 #~ msgstr "Пмл "
@@ -8141,11 +8143,6 @@ msgstr "Спи�ок змін можна перегл�нути лише дл�
 #~ msgstr "Завантаженн� �пи�ку змін"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "�еможливо знайти розв'�зок."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "�еможливо відкрити файл ієрархії пакунків %s"
diff --git a/po/vi.gmo b/po/vi.gmo
index cabbfb1d..676ae322 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
diff --git a/po/vi.po b/po/vi.po
index ed2cd9cf..f1094f94 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude 0.4.x\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-05-23 11:47+0800\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -359,24 +359,10 @@ msgstr ""
 "xuống kho lưu trong danh sách nguồn « sources.list »."
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "�ịa chỉ URL cần dùng để tải v� các bản ghi thay đổi (ChangeLog)"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"Tùy ch�n này đi�u khiển mẫu được dùng để tải các bản ghi thay đổi "
-"(changelog) xuống địa chỉ Web của Debian. Chỉ cần đi�u chỉnh tùy ch�n này "
-"nếu các bản ghi thay đổi d�n đi sang một địa chỉ URL khác."
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "Hiển thị ô xem thử việc trước khi làm nó"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -384,12 +370,12 @@ msgstr ""
 "Bật tùy ch�n này thì khi bạn yêu cầu aptitude thi hành tiến trình cài đặt, "
 "trước tiên nó sẽ hiển thị bản tóm tắt các hành động cần làm."
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "Quên gói nào là « mới » khi cập nhật danh sách gói"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -397,12 +383,12 @@ msgstr ""
 "Bật tùy ch�n này thì aptitude sẽ gột các gói mới kh�i danh sách sau khi bạn "
 "cập nhật các danh sách gói (v.d. bằng cách bấm phím « u »)."
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "Quên gói nào là « mới » khi cài đặt hay gỡ b� gói"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -411,14 +397,14 @@ msgstr ""
 "Bật tùy ch�n này thì aptitude sẽ gột các gói mới kh�i danh sách sau khi bạn "
 "thi hành tiến trình cài đặt, hoặc cài đặt hoặc gỡ b� gói từ dòng lệnh."
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr ""
 "Không hiển thị cảnh báo khi việc thay đổi thứ nhất xảy ra trong chế độ chỉ "
 "đ�c"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -427,13 +413,13 @@ msgstr ""
 "%BKhông%b bật tùy ch�n này thì aptitude sẽ hiển thị cảnh báo khi bạn sửa đổi "
 "tình trạng của gói còn không có quy�n áp dụng thay đổi đó cho hệ thống."
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr ""
 "Cảnh báo khi cố thực hiện việc có quy�n chủ khi không phải đăng nhập với tư "
 "cách ngư�i chủ"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -445,11 +431,11 @@ msgstr ""
 "Lúc đó, bạn có tùy ch�n đăng nhập với tư cách là ngư�i chủ rồi làm hành động "
 "với quy�n ngư�i chủ."
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "Tập tin vào đó cần ghi lưu các hành động"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -461,11 +447,11 @@ msgstr ""
 "lại của tên sẽ được giải thích là lệnh trình bao sẽ nhận bản ghi ở thiết bị "
 "nhập chuẩn."
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "Tự giải quyết quan hệ phụ thuộc của gói khi nó được ch�n"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -478,11 +464,11 @@ msgstr ""
 "thể làm kết quả dưới tối ưu hoặc hoàn toàn không thành công trong một số "
 "trư�ng hợp riêng."
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "Tự sửa chữa các gói bị h�ng trước khi cài đặt hay gỡ b�"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -494,11 +480,11 @@ msgstr ""
 "Không thì aptitude sẽ nhắc bạn giải quyết tiêu chuẩn quan hệ phụ thuộc chưa "
 "th�a."
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "Tự động cài đặt các gói đã khuyến khích"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -515,11 +501,11 @@ msgstr ""
 "Bật tùy ch�n này, cũng bật tùy ch�n « Tự động gỡ b� gói không dùng », thì "
 "không tự động gỡ b� gói khuyến khích bởi gói đã cài đặt."
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "Tự gỡ b� các gói không dùng"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -535,11 +521,11 @@ msgstr ""
 "Bật tùy ch�n này, cũng bật tùy ch�n « Tự động cài đặt gói khuyến khích », "
 "thì không gỡ b� gói đã cài đặt tự động cũng khuyến khích bởi gói đã cài đặt."
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "Gói không bao gi� nên bị gỡ b� tự động"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -548,13 +534,13 @@ msgstr ""
 "Gói tương ứng với chuỗi tìm kiếm này sẽ luôn luôn được xử lý như thế gói đã "
 "cài đặt có phụ thuộc vào nó : không bao gi� gỡ b� nó vì « gói không dùng »."
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr ""
 "Cho phép sự giải quyết quan hệ phụ thuộc mà làm hư tình trạng giữ lại hoặc "
 "cấm"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -576,15 +562,15 @@ msgstr ""
 "cài đặt quan hệ phụ thuộc của một gói vừa mới được ch�n để cài đặt hoặc nâng "
 "cấp, do lỗi apt #470035."
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "Tùy ch�n UI"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "Quản lý quan hệ phụ thuộc"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "Linh tinh"
 
@@ -683,7 +669,7 @@ msgstr "Không tìm thấy gói nguồn cho « %s ».\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "Không thể th�a các quan hệ phụ thuộc khi xây dựng: %s"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -692,7 +678,7 @@ msgstr ""
 "Ghi chú : « %s », nếu gói ảo « %s »\n"
 "      đã được cài đặt.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -701,7 +687,7 @@ msgstr ""
 "Ghi chú : « %s », nếu gói ảo « %s »\n"
 "      sẽ được cài đặt.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -710,17 +696,22 @@ msgstr ""
 "« %s » nằm trong cơ sở dữ liệu gói, nhưng mà\n"
 "nó không phải là gói thật, và không có gói khác cung cấp nó\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "« %s » là gói ảo được cung cấp bởi:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "Bạn phải ch�n một gói cần cài.\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Gói « %s » không có ứng cử cài đặt"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -729,63 +720,56 @@ msgstr ""
 "Ghi chú : đang lựa ch�n « %s » thay cho\n"
 "      gói ảo « %s »\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "« %s » đã được cài đặt ở phiên bản đã yêu cầu (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "Chưa cài đặt « %s » nên sẽ không cài lại nó.\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "« %s » đã được cài đặt ở phiên bản đã yêu cầu (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "Chưa cài đặt « %s » nên sẽ không cài lại nó.\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Chưa cài đặt gói « %s » nên sẽ không gỡ b� nó\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Chưa cài đặt gói « %s » nên không thể cấm nâng cấp\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "Không thể nâng cấp gói « %s » nên không thể cấm nâng cấp\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "Ghi chú : đang lựa ch�n gói « %s: %s » để cài đặt\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
+"'forbid-version' command"
 msgstr ""
 "Bạn có thể ghi rõ phiên bản gói chỉ bằng lệnh « install » (cài đặt) hoặc "
-"lệnh « forbid-version » (cấm phiên bản).\n"
+"lệnh « forbid-version » (cấm phiên bản)"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
 msgstr ""
-"Bạn có thể ghi rõ phiên bản kho gói chỉ bằng lệnh « install » (cài đặt).\n"
+"Bạn có thể ghi rõ phiên bản kho gói chỉ bằng lệnh « install » (cài đặt)"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -794,7 +778,7 @@ msgstr ""
 "Không tìm thấy gói « %s »,\n"
 "và hơn 40 gói có tên chứa « %s ».\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -803,12 +787,12 @@ msgstr ""
 "Không tìm thấy gói « %s ».\n"
 "Tuy nhiên, những gói sau có tên chứa « %s »:\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "Không tìm thấy gói nào có tên hay mô tả khớp với « %s »\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -826,7 +810,7 @@ msgstr ""
 "Không tìm thấy gói khớp với « %s ».\n"
 "Tuy nhiên, những gói sau có mô tả chứa « %s ».\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "Ký tự hành động sai « %c »\n"
@@ -849,7 +833,7 @@ msgstr "Lá»—i "
 msgid "Changelog download failed: %s"
 msgstr "Bản ghi đổi của %s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 "Không thể thực hiện tiến trình « sensible-pager »: đây là hệ thống Debian "
@@ -857,25 +841,17 @@ msgstr ""
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr ""
-"%s không phải là gói Debian chính thức nên không thể hiển thị bản ghi các "
-"thay đổi (ChangeLog) của nó."
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Không tìm thấy bản ghi các thay đổi cho « %s »"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "Không tìm thấy bản ghi các thay đổi cho « %s »"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: lệnh làm sạch (clean) không chấp nhận đối số\n"
+msgid "The clean command takes no arguments"
+msgstr "lệnh làm sạch (clean) không chấp nhận đối số"
 
 # Variable: do not translate/ biến: đừng dịch
 #: src/cmdline/cmdline_clean.cc:66
@@ -883,73 +859,64 @@ msgstr "E: lệnh làm sạch (clean) không chấp nhận đối số\n"
 msgid "Del %s* %spartial/*\n"
 msgstr "Del %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr ""
 "Không thể tra cứu thư mục chính của bạn nên lưu vào « /tmp/function_pkgs »."
 
 # Variable: don't translate / Biến: đừng dịch
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "Del %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: lệnh tự động làm sạch (autoclean) không chấp nhận đối số\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "lệnh tự động làm sạch (autoclean) không chấp nhận đối số"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "Sẽ giải phóng %sB thêm chỗ trên đĩa\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "�ã giải phóng %sB thêm chỗ trên đĩa\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Thao tác không hợp lệ %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "Gặp đối số hình mẫu bất thư�ng nằm sau « keep-all » (giữ hết)"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
 msgstr ""
 "Không thể giải quyết an toàn các quan hệ phụ thuộc: hãy thử chạy với tùy "
-"ch�n « --full-resolver » (bộ tháo gỡ đầy đủ).\n"
+"ch�n « --full-resolver » (bộ tháo gỡ đầy đủ)"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "Hủy b�.\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "tải v�: bạn phải ghi rõ ít nhất một gói cần tải v�\n"
+msgid "download: you must specify at least one package to download"
+msgstr "tải v�: bạn phải ghi rõ ít nhất một gói cần tải v�"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "Không thể đ�c danh sách nguồn"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "Không tìm thấy gói nào tên « %s »"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -989,33 +956,24 @@ msgid "[Working]"
 msgstr " [Hoạt động]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
 msgstr ""
 "extract-cache-entries: ít nhất một đối số cần thiết (thư mục vào đó cần ghi "
-"các tập tin).\n"
+"các tập tin)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "Không có gói « %s » như vậy"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr ""
 "�ưa ra một chuỗi tìm kiếm không ch�n gói nào nên không có gì cần làm.\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: lệnh quên mới (forget-new) không chấp nhận đối số\n"
+msgid "The forget-new command takes no arguments"
+msgstr "lệnh quên mới (forget-new) không chấp nhận đối số"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "Sẽ quên gói nào là mới\n"
@@ -1127,17 +1085,17 @@ msgstr "Những gói sau sẽ được nâng cấp:"
 msgid "The following partially installed packages will be configured:"
 msgstr "Theo đây có những gói đã cài đặt bộ phận sẽ được cấu hình:"
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "Những gói CHỦ YẾU sau sẽ được GỠ BỎ :\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "Những gói CHỦ YẾU sau sẽ bị HỎNG bởi hành động này:\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1147,16 +1105,16 @@ msgstr ""
 "sụp đổ.\n"
 "\t�ỪNG tiếp tục, nếu bạn không biết CH�NH X�C bạn đang làm gì.\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "Tôi hiểu rằng đây là ý kiến rất xấu"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "�ể tiếp tục, hãy gõ cụm từ « %s »:\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1172,7 +1130,7 @@ msgstr ""
 "Bạn nên tiếp tục cài đặt chỉ nếu bạn có chắc muốn làm việc này.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1181,7 +1139,7 @@ msgstr ""
 "••• CẢNH B�O   �ang b� qua những việc vi pham sự tin vì\n"
 "              %s::CmdLine::Ignore-Trust-Violations là 'true' (đúng) •••\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1194,7 +1152,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1203,99 +1161,99 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "Bạn có muốn b� qua cảnh báo này, vẫn cứ tiếp tục không?\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "�ể tiếp tục, nhập « %s »; còn để hủy b�, nhập « %s »: "
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "Không nhận biết dữ liệu nhập. Hãy nhập hoặc « %s » hoặc « %s ».\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "Những gói sau được KHUYẾN KH�CH nhưng mà sẽ KHÔNG được cài đặt:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "Những gói sau được �Ề NGHỊ nhưng mà sẽ KHÔNG được cài đặt:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "Không có gói nào sẽ được cài đặt, nâng cấp hoặc gỡ b�.\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu gói được nâng cấp, %lu mới được cài đặt, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu được cài lại, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu được hạ cấp, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu cần gỡ b�, và %lu không được nâng cấp.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "Cần phải lấy %sB/%sB kho. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "Cần phải lấy %sB kho. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "Sau khi giải nén %sB sẽ được chiếm.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "Sau khi giải nén %sB thêm sẽ được giải phóng.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 "Không có gói nào cần hiển thị: hãy nhập các tên gói vào dòng, sau chữ « i "
 "».\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "Bấm phím Return để tiếp tục."
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 "Không tìm thấy gói nào: hãy nhập các tên gói vào dòng, sau chữ « c ».\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
@@ -1303,42 +1261,42 @@ msgid ""
 msgstr ""
 "Không tìm thấy gói — hãy nhập vào ≥0 gốc tìm kiếm rồi tên gói cần bào chữa.\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "tiếp tục lại cài đặt"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "hủy b� rồi thoát"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr ""
 "hiển thị thông tin v� một hay nhi�u gói; các tên gói nên nằm sau chữ « i »"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
@@ -1346,39 +1304,39 @@ msgstr ""
 "hiển thị bản ghi thay đổi Debian của một hay nhi�u gói; các tên gói nên nằm "
 "sau chữ « c »"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "bật/tắt hiển thị thông tin v� quan hệ phụ thuộc"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "bật/tắt hiển thị các thay đổi kích cỡ gói"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "bật/tắt hiển thị các số thứ tự phiên bản"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1386,27 +1344,27 @@ msgstr ""
 "thử tìm lý do cần cài đặt một gói riêng lẻ, hoặc giải thích tại sao cài đặt "
 "một gói nên đưa tới cài đặt gói khác."
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 "chạy bộ tự động giải quyết quan hệ phụ thuộc để sửa chữa các quan hệ phụ "
 "thuộc bị ngắt."
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "vào toàn giao diện trực quan"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1418,48 +1376,48 @@ msgstr ""
 "hình mẫu) theo sau. Hành động đó sẽ được áp dụng vào tất cả các gói bạn liệt "
 "kê. Có sẵn những hành động này:"
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "« + » để cài đặt gói"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr ""
 "« +M » để cài đặt gói và ngay đánh dấu mỗi đi�u đã được cài đặt tự động"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "« - » để gỡ b� gói"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "« _ » để tẩy gói"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "« = » để giữ lại gói"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 "« : » để giữ các gói trong tình trạng hiện th�i, không cần đặt tình trạng "
 "Giữ lại"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "« &M » để nhãn các gói đã được cài đặt tự động"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "« &m » để nhãn các gói đã được cài đặt bằng tay"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "« &BD » để cài đặt các quan hệ phụ thuộc khi xây dựng gói."
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1467,29 +1425,29 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "« &M » để nhãn các gói đã được cài đặt tự động"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "Lệnh:"
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1497,21 +1455,21 @@ msgstr ""
 "Trình aptitude không thể giải quyết quan hệ phụ thuộc này. Vậy bạn cần phải "
 "tự giải quyết, hoặc bấm phím « n » để thoát."
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "Bạn có muốn tiếp tục chứ? [Y/n : Có/không] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "Bạn tự giải quyết quan hệ phụ thuộc này không? [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 "�áp ứng không hợp lệ. Hãy nhập một lệnh hợp lệ, hoặc lệnh « ? » để xem trợ "
 "giúp.\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1519,7 +1477,7 @@ msgstr ""
 "Hãy gõ một lệnh quản lý gói (v.d. « + tên_gói » để cài đặt gói đó), « R » để "
 "thử tự động giải quyết quan hệ phụ thuộc, hay « N » để hủy b�."
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1530,7 +1488,7 @@ msgstr ""
 "Thông tin v� quan hệ phụ thuộc sẽ được hiển thị.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1541,7 +1499,7 @@ msgstr ""
 "Thông tin v� quan hệ phụ thuộc sẽ không được hiển thị.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1552,7 +1510,7 @@ msgstr ""
 "Số thứ tự phiên bản sẽ được hiển thị.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1563,7 +1521,7 @@ msgstr ""
 "Số thứ tự phiên bản sẽ không được hiển thị.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1574,7 +1532,7 @@ msgstr ""
 "Cách thay đổi kích cỡ sẽ được hiển thị.\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1710,6 +1668,11 @@ msgstr "�ợi ít nhất một cặp gói/phiên bản nằm sau « %c »"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "�ợi một phiên bản hoặc « %s » nằm sau « %s »"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "Không có gói « %s » như vậy"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1861,7 +1824,7 @@ msgstr ""
 "Trình này có thể giải quyết quan hệ phụ thuộc, nhưng chưa tạo bộ giải quyết "
 "quan hệ phụ thuộc."
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1892,7 +1855,7 @@ msgstr ""
 msgid "The following commands are available:"
 msgstr "Có sẵn những lệnh này:"
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "Tập tin vào đó cần ghi tình trạng tháo gỡ : "
 
@@ -1927,7 +1890,7 @@ msgstr ""
 "*** LỖI: việc tìm bị hủy b� bởi ngoại lệ nghiệm tr�ng. Bạn vẫn còn có khả "
 "năng tiếp tục tìm, nhưng không thể tới một số phép giải riêng."
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1936,28 +1899,27 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr ""
 "Không thể giải quyết các quan hệ phụ thuộc cho tiến trình nâng cấp (không "
 "tìm thấy giải pháp)."
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr ""
 "Không thể giải quyết các quan hệ phụ thuộc cho tiến trình nâng cấp (%s)."
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "việc iconv « %s » bị lỗi.\n"
+msgid "iconv of %s failed"
+msgstr "việc iconv « %s » bị lỗi"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "tìm kiếm: bạn phải cung cấp ít nhất một từ tìm kiếm\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "tìm kiếm: bạn phải cung cấp ít nhất một từ tìm kiếm"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -2000,7 +1962,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Những gói sau có quan hệ phụ thuộc chưa th�a:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<VÔ GI� TRỊ>"
@@ -2224,7 +2186,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "Cung cấp"
 
@@ -2238,15 +2200,9 @@ msgstr "Mô tả: "
 msgid "Homepage: "
 msgstr "Trang chủ : "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Không thể định vị gói %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "Không thể phân tích hình mẫu %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "Không tìm thấy gói"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2257,14 +2213,13 @@ msgstr "Nên tải v� / cài đặt/ gỡ b� các gói.\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "Gặp lỗi nội bộ vì chưa sắp xếp xong"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "�ang xóa các tập tin cũ đã tải v�"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: lệnh cập nhật không chấp nhận đối số\n"
+msgid "The update command takes no arguments"
+msgstr "lệnh cập nhật không chấp nhận đối số"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2281,129 +2236,151 @@ msgstr "�ang gỡ b� thẻ ngư�i dùng « %s » kh�i gói « %s ».\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr "%s: quá ít đối số ; đợi ít nhất một tên thẻ và một gói.\n"
 
-#: src/cmdline/cmdline_util.cc:167
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No candidate version found for %s\n"
-msgstr "Không tìm thấy phiên bản ứng cử cho %s\n"
+msgid "No candidate version found for %s"
+msgstr "Không tìm thấy phiên bản ứng cử cho %s"
 
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "Không tìm thấy phiên bản ứng cử hoặc hiện th�i cho %s\n"
+msgid "No current or candidate version found for %s"
+msgstr "Không tìm thấy phiên bản ứng cử hoặc hiện th�i cho %s"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "Không tìm thấy kho « %s » cho gói « %s »\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "Không tìm thấy kho « %s » cho gói « %s »"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "Không tìm thấy phiên bản « %s » cho gói « %s »\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "Không tìm thấy phiên bản « %s » cho gói « %s »"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
 msgstr ""
 "Gặp lỗi nội bộ : giá trị không hợp lệ %i đư�c gởi qua cho « cmdline_find_ver "
-"» (dòng lệnh tìm phiên bản).\n"
+"» (dòng lệnh tìm phiên bản)"
 
-#: src/cmdline/cmdline_util.cc:239
-#, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "Không thể ghi rõ cả kho lẫn phiên bản đ�u cho gói.\n"
-
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Không tìm thấy bản ghi các thay đổi cho « %s »"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "Không thể ghi rõ cả kho lẫn phiên bản đ�u cho gói"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d gói bị ngắt [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d gói cập nhật [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d gói mới [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "Trạng thái hiện th�i: %F."
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "Có %d gói mới trở thành quá cũ :"
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "Có %d gói mới trở thành quá cũ :"
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "Không có dấu phẩy đi theo tên thẻ « %s »"
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Không thể định vị gói %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Không tìm thấy bản ghi các thay đổi cho « %s »"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "Ghi chú : đang lựa ch�n gói « %s: %s » để cài đặt\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "Không tìm thấy bản ghi các thay đổi cho « %s »"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "Gói"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "Gói nguồn: "
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "Kho"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "tìm kiếm: bạn phải cung cấp ít nhất một từ tìm kiếm\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2426,7 +2403,7 @@ msgstr "Hiện_th�i"
 msgid "Candidate"
 msgstr "Ứng_cử"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "Cài"
 
@@ -2529,20 +2506,18 @@ msgstr "Không tìm thấy lý do cần cài đặt %s.\n"
 msgid "Packages requiring %s:"
 msgstr "Các gói phụ thuộc vào %s"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Không có gói tên « %s » tồn tại."
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "Không thể phân tích một số mẫu khớp."
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, fuzzy, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr "%s: lệnh này cần thiết ít nhất một đối số (gói cần truy cập)."
 
 #: src/cmdline/cmdline_why.h:212
@@ -2569,11 +2544,11 @@ msgstr "CHƯA ỔN"
 msgid "UNAVAILABLE"
 msgstr "KHÔNG CÓ SẴN"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "Thẻ"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "Thẻ ngư�i dùng"
 
@@ -2784,32 +2759,32 @@ msgstr ""
 "đang cài đặt gói. �ang mở ở chế độ chỉ đ�c: thay đổi nào bạn làm trong tình "
 "trạng gói sẽ KHÔNG được lưu."
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 msgid "allowed"
 msgstr "cho_phép_ch�n"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "chính"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2876,34 +2851,40 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr "Bộ nhớ tạm gói chưa sẵn sàng nên không thể tải v� và cài đặt gói."
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "Gặp lỗi nội bộ : không thể tạo ra danh sách các gói cần tải v�"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "Lỗi lấy %s: %s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "Không thể sửa chữa trư�ng hợp có các gói không sẵn sàng"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "Một gói không cài đặt được. �ang cố phục hồi:"
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr ""
@@ -3056,13 +3037,13 @@ msgstr ""
 "\n"
 "Ghi lÆ°u xong.\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "�ang tài v� các gói"
@@ -3174,18 +3155,18 @@ msgid ""
 msgstr ""
 "Các tập tin phụ lục gói bị h�ng. Không có trư�ng « Tên tập tin: » cho gói %s."
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "Bản ghi đổi của %s"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "�ịa chỉ URL cần dùng để tải v� các bản ghi thay đổi (ChangeLog)"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "�ịa chỉ URL cần dùng để tải v� các bản ghi thay đổi (ChangeLog)"
@@ -3234,26 +3215,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "Không thể phân tích hình mẫu %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "�ang xây dựng cơ sở dữ liệu thẻ"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "Chưa cài đặt"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "Chưa cài đặt"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3403,40 +3385,40 @@ msgstr ""
 msgid "_File"
 msgstr "Sai"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "Thực hiện m�i việc cài đặt và gỡ b� bị hoãn"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "Kiểm tra có phiên bản gói mới chưa"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 "�ánh dấu m�i gói có khả năng nâng cấp mà không được giữ lại để nâng cấp"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "Quên những gói nào là « Mới »"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "Thôi các việc cài đặt, gỡ b�, giữ lại và nâng cấp bị hoãn."
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "Xóa các tập tin gói đã tải v� trước"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "Xóa các tập tin gói không còn tải v� được"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "Nạp lại bộ nhớ tạm gói"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3446,7 +3428,7 @@ msgstr ""
 "Hãy chạy lệnh « su » để trở thành ngư�i chủ: việc này sẽ khởi chạy lại "
 "chương trình, còn giữ lại các thiết lập của bạn"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "Thoát kh�i chương trình"
 
@@ -3454,7 +3436,7 @@ msgstr "Thoát kh�i chương trình"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "Hồi lại thao tác (hay nhóm thao tác) gói cuối cùng"
 
@@ -3488,7 +3470,7 @@ msgid "_Help"
 msgstr "Trợ giúp"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3497,19 +3479,19 @@ msgstr ""
 msgid "Update"
 msgstr "Cập nhật danh sách"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "Gói"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "Xem thá»­"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "Bộ tháo gỡ"
 
@@ -3696,7 +3678,7 @@ msgid "Fix Manually"
 msgstr "Sổ tay"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "Nâng cấp"
 
@@ -4228,11 +4210,11 @@ msgstr "�ã cài"
 msgid "Reinstall"
 msgstr "Cài lại"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "Hạ cấp"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "B�"
 
@@ -4268,7 +4250,7 @@ msgstr "�p dụng bộ l�c vào danh sách gói"
 msgid "Download already running."
 msgstr "�ang tải v�..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "Việc cập nhật hoặc cài đặt danh sách gói đang xảy ra."
 
@@ -4329,37 +4311,37 @@ msgstr "Không có gói bị h�ng."
 msgid "Asking whether to replace the configuration file %s"
 msgstr "Không thể thay thế %s bằng tập tin cấu hình mới"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "�ang tài v� các gói"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "Không có gói bị h�ng."
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "Không có gói bị h�ng."
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "Tháo gỡ quan hệ phụ thuộc"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "Không có gói nào bị h�ng."
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s thay đổi"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s thay đổi"
@@ -4367,7 +4349,7 @@ msgstr "%s thay đổi"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4376,63 +4358,63 @@ msgstr[0] "%d lần cài"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "lỗi gỡ b� %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "Cỡ_Tải_V�"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "chưa cài đặt"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "�ã cài"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "^Tẩy"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "Giữ"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "Giữ lại"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "Sổ tay ngư�i dùng"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4472,7 +4454,7 @@ msgstr "không"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4517,17 +4499,17 @@ msgstr "%s; sẽ được cài đặt tự động"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "Tìm kiếm"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "�ang xây dựng ô xem"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "�ang xây dựng ô xem"
@@ -5219,108 +5201,109 @@ msgstr "Không rõ kiểu canh l� « %s »"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "Chính sách sắp xếp theo tên không chấp nhận đối số"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "Tên chính sách sắp xếp có độ dài bằng không là không hợp lệ"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "Có dấu « ( » riêng lẻ trong mô tả chính xác sắp xếp"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "Kiểu chính sách sắp xếp không hợp lệ « %s »"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "Không thể giải mã chuỗi đa byte nằm sau « %ls »"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "Không thể giải mã chuỗi ký tự rộng nằm sau « %s »"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s được biên dịch vào %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Bộ biên dịch: g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "Biên dịch so với:\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt phiên bản %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  NCurses phiên bản: Không rõ\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  NCurses phiên bản: %s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++ phiên bản: %s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Hỗ trợ Ept đã được bật.\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Hỗ trợ Ept bị tắt.\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt phiên bản %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt phiên bản %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Hỗ trợ Ept bị tắt.\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s được biên dịch vào %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Hỗ trợ Ept bị tắt.\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5328,32 +5311,32 @@ msgstr ""
 "\n"
 "Các phiên bản thư viện hiện th�i:\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  NCurses phiên bản: %s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  cwidget phiên bản: %s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Apt phiên bản: %s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Cách sử dụng: aptitude [-S tên_tập_tin] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [tùy_ch�n ...] <hành_động> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5363,42 +5346,42 @@ msgstr ""
 "tÆ°Æ¡ng):\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, fuzzy, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      _cài đặt_ / nâng cấp gói\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, fuzzy, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       _Gỡ b�_ gói\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, fuzzy, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        Gỡ b� gói và các tập tin cấu hình (_tẩy_)\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, fuzzy, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         _Giữ lại_ gói\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, fuzzy, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       Thôi lệnh « giữ lại » cho gói đó\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, fuzzy, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     _�ánh dấu_ gói như là được cài đặt _tự động_\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, fuzzy, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   �ánh dấu gói như là được cài đặt bằng tay\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5407,69 +5390,69 @@ msgstr ""
 " forbid-version  \t_Cấm_ trình aptitude nâng cấp lên một _phiên bản_ đã ghi "
 "rõ.\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, fuzzy, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       Tải v� các danh sách gói mới / có thê _cập nhật_\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, fuzzy, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade \tNâng cấp an toàn\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, fuzzy, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
 msgstr " full-upgrade\t\tNâng cấp, có thể cài đặt và gỡ b� gói\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "« &BD » để cài đặt các quan hệ phụ thuộc khi xây dựng gói."
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, fuzzy, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   \t_Quên_ gói nào là _« mới »_\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, fuzzy, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       _Tìm kiếm_ gói theo tên và/hay biểu thức\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, fuzzy, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         _Hiển thị_ thông tin chi tiết v� gói\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         _Hiển thị_ thông tin chi tiết v� gói\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, fuzzy, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        _Xóa_ các tập tin gói đã tải v�\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, fuzzy, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    _Xóa_ các tập tin gói cũ đã tải v� (_tự động_)\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, fuzzy, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    Xem _bản ghi thay đổi_ của gói\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, fuzzy, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     _Tải v�_ tập tin kiểu .deb cho gói\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, fuzzy, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
@@ -5477,7 +5460,7 @@ msgid ""
 msgstr ""
 " reinstall    Tải v� và (có thể) _cài đặt lại_ gói được cài đặt hiện th�i\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, fuzzy, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5487,7 +5470,7 @@ msgstr ""
 " why\t\tHiển thị các gói đã cài đặt bằng tay mà cần thiết một gói nào đó,\n"
 "\t\thoặc lý do một hay nhi�u gói có thể cần thiết gói đã cho.\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, fuzzy, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5500,55 +5483,55 @@ msgstr ""
 "\t\t\tmột hay nhi�u gói (nếu được cài đặt) sẽ đưa tới\n"
 "\t\t\ttrư�ng hợp này.\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  Tùy ch�n:\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, fuzzy, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             _Trợ giúp_ này\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             _Trợ giúp_ này\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             _Mô ph�ng_ hành động còn không thật thực hiện\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr " -d             Chỉ _tải v�_ gói, không cài đặt hoặc gỡ b� gì.\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, fuzzy, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             Luôn luôn _nhắc_ với sự xác nhận hoặc hành động\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, fuzzy, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
@@ -5556,7 +5539,7 @@ msgstr ""
 " -y             Giả sử trả l�i cho câu h�i kiểu « có/không » đơn giản là "
 "_Có_ (yes)\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, fuzzy, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
@@ -5564,7 +5547,7 @@ msgid ""
 msgstr ""
 " -F format      Ghi rõ _định dạng_ hiển thị kết quả tìm kiếm; xem sổ tay\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, fuzzy, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
@@ -5573,23 +5556,23 @@ msgstr ""
 " -O order       Ghi rõ cách sắp xếp kết quả tìm kiếm; xem sổ tay (_thứ "
 "tá»±_).\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, fuzzy, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w width       Ghi rõ _độ rộng_ hiển thị kết quả tìm kiếm\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Cố gắng _sửa chữa_ các gói bị h�ng một cách năng nổ.\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             Hiển thị _phiên bản_ nào của gói sẽ được cài đặt.\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
@@ -5597,12 +5580,12 @@ msgstr ""
 " -D             Hiển thị đi�u kiện _phụ thuộc_ của các gói đã thay đổi tự "
 "Ä‘á»™ng.\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    Hiển thị hiệu số kích cỡ đã cài đặt của mỗi gói.\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, fuzzy, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
@@ -5610,27 +5593,27 @@ msgid ""
 msgstr ""
 " -v        Hiển thị thông tin thêm (có lẽ cung cấp nhi�u lần [_chi tiết_])\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, fuzzy, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [bản]   \t�ặt bản phát hành từ đó cần cài đặt gói\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, fuzzy, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr "  -q\t\tTrong chế độ dòng lệnh, thu hồi các cái chỉ tiến hành dần.\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, fuzzy, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr ""
 " -o key=giá_trị      �ặt trực tiếp _tùy ch�n_ cấu hình có tên « key » (phím/"
 "khoá)\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, fuzzy, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5639,29 +5622,29 @@ msgstr ""
 " --with(out)-recommends\tGhi rõ có nên xử lý gói đã khuyến khích (recommend) "
 "như là quan hệ phụ thuộc mạnh hay không (_[không] khuyến khích_).\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 " -S tên_tập_tin: ��c thông tin _trạng thái_ kéo dài aptitude từ tập tin "
 "này.\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Tải v� các danh sách gói mới khi khởi chạy.\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr "\t\tcác chỉ thị.\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Chạy lệnh _cài đặt_ (install) khi khởi chạy.\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
@@ -5670,132 +5653,112 @@ 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:393
+#: src/main.cc:359
 #, fuzzy
 msgid "trace"
 msgstr "đúng"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 msgid "info"
 msgstr "không"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 msgid "error"
 msgstr "Lá»—i "
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:408
+#: src/main.cc:374
 #, fuzzy
 msgid "fatal"
 msgstr "sai"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "Thao tác không hợp lệ %s"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "�ợi một số nằm sau « -q= »\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "�ợi một số nằm sau « -q= », còn nhận %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "Tùy ch�n « -o » cần thiết đối số dạng « key=giá_trị », còn nhân %s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "Không có dấu phẩy đi theo tên thẻ « %s ».\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "LẠ: nhận mã tùy ch�n không rõ\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "Gói"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "M�i gói"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5803,38 +5766,33 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "Có thể ghi rõ chỉ một của hai tùy ch�n « -u »  và « -i »\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "Không thể ghi rõ tùy ch�n « -u » hay « -i » trong chế độ dòng lệnh (v.d. với "
 "lệnh 'install' (cài) đặt)."
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "Không thể ghi rõ tùy ch�n « -u » hay « -i » với lệnh nào"
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "Không rõ lệnh « %s »\n"
+msgid "Unknown command \"%s\""
+msgstr "Không rõ lệnh « %s »"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "Ngoại lệ chưa bắt: %s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5852,7 +5810,7 @@ msgstr "Tìm kiếm:"
 msgid "Search backwards for: "
 msgstr "Tìm kiếm ngược: "
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "Quét mìn"
 
@@ -6062,7 +6020,7 @@ msgstr "UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 19 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "Gói"
 
@@ -6143,8 +6101,8 @@ msgstr "<K0 có>"
 msgid "<none>"
 msgstr "<không>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "ảo"
@@ -6278,7 +6236,7 @@ msgstr "Không thể chuyển mã của định dạng trình bày gói đi sau
 msgid "Internal error: Default column string is unparsable"
 msgstr "Gặp lỗi nội bộ : không thể phân tích chuỗi cột mặc định"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "Tác vụ"
 
@@ -6435,11 +6393,11 @@ msgstr "Chỉ số khớp phải là 1 hoặc lớn hơn, không phải « %s »
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "Chỉ số khớp %ls quá lớn; các nhóm sẵn sàng là (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "GÓI KHÔNG CÓ THẺ"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6449,10 +6407,6 @@ msgstr ""
 " Những gói này chưa được phân loại trong cơ sở dữ liệu debtags, hoặc không "
 "có cơ sở dữ liệu debtags (cài đặt debtags có thể sửa chữa vấn đ� này)."
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "THIẾU THẺ"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "Gói nguồn: "
@@ -7074,7 +7028,7 @@ msgstr "�ang nạp bộ nhớ tạm"
 msgid "Really quit Aptitude?"
 msgstr "Thật sự thoát trình Aptitude không?"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "Thay đổi ứng xử của aptitude"
 
@@ -7157,7 +7111,7 @@ msgstr ""
 msgid "License"
 msgstr "Giấy phép"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "Xem các đi�u kiện sao chép và phân phối aptitude"
 
@@ -7178,7 +7132,7 @@ msgstr "Trợ giúp trực tiếp"
 msgid "View a brief introduction to aptitude"
 msgstr "Xem l�i giới thiệu ngắn v� aptitude"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "Trợ giúp"
 
@@ -7207,7 +7161,7 @@ msgstr "Sổ tay"
 msgid "FAQ"
 msgstr "H�i �áp"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "Xem danh sách các câu thư�ng h�i"
 
@@ -7248,15 +7202,15 @@ msgstr ""
 "gỡ b� thư mục này và các nội dung của nó không? Nếu bạn ch�n « Không » (No), "
 "bạn sẽ không xem thông điệp này lần nữa."
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "Xem cách tiến hành việc tải v� gói"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "Tải v� gói"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7267,35 +7221,35 @@ msgstr ""
 "%nGói không đáng tin có thể %Brủi ro bảo mật của hệ thống này%b. Bạn chỉ nên "
 "tiếp tục cài đặt nếu bạn có chắc chắn muốn làm như thế.%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [phiên bản %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "Thực sự tiếp tục"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "Hủy b� cài đặt"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "Xem thử việc cài gói"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "Xem và/hay đi�u chỉnh những hành động cần thực hiện"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "Một số gói bị h�ng thì đã được sửa chữa:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "Không có giải pháp nào cho những vấn đ� quan hệ phụ thuộc này."
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
@@ -7304,7 +7258,7 @@ msgstr ""
 "Hết th�i gian khi cố gắng tháo gỡ quan hệ phụ thuộc (bấm « %s » để cố tích "
 "cực hơn)."
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7312,19 +7266,19 @@ msgstr ""
 "Việc cài đặt/gỡ b� gói cần thiết quy�n truy cập quản trị mà bạn hiện th�i "
 "không có. Bạn có muốn chuyển đổi sang tài khoản ngươi chủ (root) phải không?"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "Trở thành Ngư�i chủ"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "Không trở thành Ngư�i chủ"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "Không có gói nào được định cài đặt, gỡ b� hoặc nâng cấp."
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7334,19 +7288,19 @@ msgstr ""
 "được nâng cấp, nhưng mà bạn chưa ch�n nâng cấp chúng. Hãy gõ phím « U » để "
 "chuẩn bị việc nâng cấp."
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "�ang cập nhật các danh sách gói"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "Xem cách tiến hành việc cập nhật danh sách gói"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "Cập nhật danh sách"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
@@ -7354,23 +7308,23 @@ msgstr ""
 "Việc cập nhật danh sách gói cần thiết quy�n truy cập quản trị, mà bạn hiện "
 "th�i không có. Bạn có muốn chuyển đổi sang tài khoản ngư�i chủ phải không?"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "Hoài phí thì giờ bằng cách cố gắng tìm mìn"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "Không cho phép xóa sạch trong khi tải v� gì"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "�ang xóa các tập tin đã tải v�"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "Các tập tin gói đã tải v� đã được xoá"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7379,11 +7333,11 @@ msgstr ""
 "Việc cập nhật danh sách gói cần thiết quy�n truy cập quản trị, mà bạn hiện "
 "th�i không có. Bạn có muốn chuyển đổi sang tài khoản ngư�i chủ phải không?"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "Bộ nhớ tạm apt chưa sẵn sàng nên không thể xóa sạch tự động."
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
@@ -7392,7 +7346,7 @@ msgstr ""
 "Các tập tin gói cũ đã tải v� đã được xoá, mà giải phóng thêm %sB chỗ trên "
 "Ä‘Ä©a."
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7401,121 +7355,121 @@ msgstr ""
 "Việc cập nhật danh sách gói cần thiết quy�n truy cập quản trị, mà bạn hiện "
 "th�i không có. Bạn có muốn chuyển đổi sang tài khoản ngư�i chủ phải không?"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "Không có giải pháp nữa."
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "Không tìm thấy giải pháp để dụng."
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "Hết th�i gian khi cố gắng tìm giải pháp."
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "Tháo gỡ quan hệ phụ thuộc"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "Tìm kiếm giải pháp quan hệ phụ thuộc chưa th�a"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "Không thể mở %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "Gặp lỗi khi đổ tình trạng bộ tháo gỡ"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "Cà^i/B� gói"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "^Cập nhật danh sách gói"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "Nhãn Nân^g cấp được"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "^Quên các gói mới"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "^Thôi các hành động bị hoãn"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "^Xóa bộ nhớ tạm gói"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "Xóa các tập tin ^cũ"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "Nạp ^lại bộ nhớ tạm gói"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "Chơi Quét ^Mìn"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "Trở thành ^Ngư�i chủ"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "T^hoát"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "Hủy bước"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "Cà^i"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "�ánh dấu gói đã ch�n hiện th�i để cài đặt hoặc nâng cấp"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "^B�"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "�ánh dấu gói đã ch�n hiện th�i để gỡ b�"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "^Tẩy"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "�ánh dấu gói đã ch�n hiện th�i và các tập tin câu hình nó để gỡ b�"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "^Giữ"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "Thôi hành động nào với gói được ch�n"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "Giữ ^lại"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
@@ -7523,11 +7477,11 @@ msgstr ""
 "Thôi hành động nào với gói được ch�n, và bảo vệ nó chống các việc nâng cấp "
 "sau"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "Nhãn ^Tự �ộng"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 msgid ""
 "Mark the selected package as having been automatically installed; it will "
 "automatically be removed if no other packages depend on it"
@@ -7535,11 +7489,11 @@ msgstr ""
 "�ánh dấu gói đã ch�n « đã được cài đặt tự động »; nó sẽ được gỡ b� tự động "
 "nếu không có gói khác phụ thuộc vào nó."
 
-#: src/ui.cc:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "Nhãn ^Bằng tay"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
@@ -7547,11 +7501,11 @@ msgstr ""
 "�ánh dấu gói đã ch�n « đã được cài đặt bằng tay »; nó sẽ không được gỡ b� "
 "trừ khi bạn tự gỡ b� nó bằng tay."
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "Cấm ^Phiên bản"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 msgid ""
 "Forbid the candidate version of the selected package from being installed; "
 "newer versions of the package will be installed as usual"
@@ -7559,19 +7513,19 @@ msgstr ""
 "Cấm cài đặt phiên bản ứng cử của gói đã ch�n; các phiên bản mới hơn sẽ được "
 "cài đặt như bình thư�ng"
 
-#: src/ui.cc:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "Thông ti^n"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "Hiển thị thông tin thêm v� gói đã ch�n"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "^Quay lại thông tin gói"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7581,94 +7535,94 @@ msgstr ""
 "v� gói, một bản tóm tắt v� trạng thái phụ thuộc của nó, hoặc sự phân tích v� "
 "lý do cần thiết gói đó."
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "^Bản ghi đổi"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "Hiển thị bản ghi các thay đổi (ChangeLog) cho gói đa ch�n"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "X^em giải pháp"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "Kiểm tra giải pháp vấn đ� phụ thuộc hiện th�i được ch�n."
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "�^p dụng giải pháp"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "Thực hiện những hành động của giải pháp hiện th�i được ch�n."
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "Giải pháp ^kế"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "Ch�n giải pháp vấn đ� phụ thuộc kế tiếp."
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "Giải ^pháp trước"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "Ch�n giải pháp vấn đ� phụ thuộc trước đó."
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "Giải pháp đầ^u"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "Ch�n giải pháp vấn đ� phụ thuộc thứ nhất."
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "Giải pháp cuố_i"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr ""
 "Ch�n giải pháp vấn đ� phụ thuộc cuối cùng đã được tạo ra cho đến bây gi�."
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "Bật tắt ^Bác b�"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "Bật tắt bác b� hành động hiện th�i được ch�n."
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "Bật tắt ^Chấp nhận"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "Bật tắt chấp nhận hành động hiện th�i được ch�n."
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "^Xem đích"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "Xem gói mà hành động được ch�n sẽ tác động"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "Từ chối làm ^hư sự Giữ lại"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
@@ -7676,221 +7630,221 @@ msgstr ""
 "Từ chối m�i hành vi có thể thay đổi tình trạng của gói đã giữ lại hoặc cài "
 "đặt phiên bản bị cấm"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "^Tìm"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "Tìm kiếm tới"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "Tìm ^ngược"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "Tìm kiếm ngược"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "Tìm ^lại"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "Tìm lại chuỗi mới tìm"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "Tìm lại ^ngược"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "Tìm lại chuỗi mới tìm v� hướng ngược"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "^Hạn hiện thị"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "�p dụng bộ l�c vào danh sách gói"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "^B� hạn hiện thị"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "Gỡ b� bộ l�c kh�i danh sách gói"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "Tìm ^Bị ngắt"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "Tìm gói kế tiếp có quan hệ phụ thuộc chưa được th�a"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "Tù^y thích"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "Tùy ch�n _UI"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "Thay đổi thiết lập làm ảnh hưởng đến giao diện ngư�i dùng"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "^Quản lý quan hệ phụ thuộc"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "Thay đổi thiết lập làm ảnh hưởng đến cách quản lý quan hệ phụ thuộc."
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "^Linh tinh"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "Thay đổi thiết lập chương trình lặt vặt"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "H^oàn nguyên tùy ch�n"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "Hoàn nguyên trở lại các thiết lập thành giá trị măc định của hệ thống"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "^Kế"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "Xem bộ trình bày kế tiếp"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "^Lùi"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "Xem bộ trình bày trước đó"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "�ón^g"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "�óng bộ trình bày này"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "Ô ^xem gói mới"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "Tạo một ô xem gói mặc định mới"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "Kiểm tra sự ^Khuyên"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr "Xem các gói đã khuyên bạn cài đặt, mà hiện th�i không được cài đặt ."
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "Danh sách gói ^phẳng mới"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "Xem các gói trong hệ thộng, theo cùng một danh sách không có loại"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "Bộ duyệt ^Debtags mới"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "Duyệt qua các gói bằng dữ liệu Debtags"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "^Bộ duyệt phân loại mới"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "Duyệt các gói theo phân loại"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "^Giới thiệu"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "Xem thông tin v� chương trình này"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "Trợ g^iúp"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "Xem trợ giúp có sẵn"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "^Sổ tay ngư�i dùng"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "Xem sổ hướng dẫn chi tiết cho chương trình này"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "^H�i �áp"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "Ti^n tức"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "Xem những thay đổi quan tr�ng được làm trong mỗi phiên bản của "
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "Giấ^y phép"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "Hành vi"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "Tùy ch�n"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "Xem"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
@@ -7899,11 +7853,11 @@ msgstr ""
 "%ls: Trình đơn  %ls: Trợ giúp  %ls: Thoát  %ls: Cập nhật  %ls: Tải v�/Cài "
 "đặt/B� gói"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "c"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "k"
 
@@ -7931,9 +7885,51 @@ msgstr "�ịa chỉ URL cần dùng để tải v� các bản ghi thay đổi
 msgid "Downloading the changelog of %s"
 msgstr "�ang tải v� Bản ghi đổi"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "Bạn chỉ có thể xem bản ghi đổi của gói Debian chính thức."
+#~ msgid "MISSING TAG"
+#~ msgstr "THIẾU THẺ"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "�ịa chỉ URL cần dùng để tải v� các bản ghi thay đổi (ChangeLog)"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "Tùy ch�n này đi�u khiển mẫu được dùng để tải các bản ghi thay đổi "
+#~ "(changelog) xuống địa chỉ Web của Debian. Chỉ cần đi�u chỉnh tùy ch�n này "
+#~ "nếu các bản ghi thay đổi d�n đi sang một địa chỉ URL khác."
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr ""
+#~ "%s không phải là gói Debian chính thức nên không thể hiển thị bản ghi các "
+#~ "thay đổi (ChangeLog) của nó."
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "Không tìm thấy gói nào tên « %s »"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "Không thể phân tích hình mẫu %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "�ợi một số nằm sau « -q= »\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "�ợi một số nằm sau « -q= », còn nhận %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr ""
+#~ "Tùy ch�n « -o » cần thiết đối số dạng « key=giá_trị », còn nhân %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "LẠ: nhận mã tùy ch�n không rõ\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "Không thể ghi rõ tùy ch�n « -u » hay « -i » với lệnh nào"
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "Bạn chỉ có thể xem bản ghi đổi của gói Debian chính thức."
 
 #~ msgid "Err "
 #~ msgstr "Lá»—i "
@@ -8110,11 +8106,6 @@ msgstr "Bạn chỉ có thể xem bản ghi đổi của gói Debian chính thá»
 #~ msgstr "�ang tải v� Bản ghi đổi"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "Không tìm thấy giải pháp."
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "Không thể mở tập tin phân cấp gói %s"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 10af00d9..9b573e9f 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6afda725..2b00034d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-06-03 12:32+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -340,23 +340,10 @@ msgstr ""
 "能从任何 sources.list 指定的档案中下载的软件包文件。"
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "用于下载�更日志的 URL"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"此选项控制用�从 Debian 网站下载更新日志的模�。您仅需�在更新日志移动到��"
-"的 URL 时修改这个选项。"
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "在实际执行动作�显示将执行动作的预览"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
@@ -364,24 +351,24 @@ msgstr ""
 "如果开�此选项，则当您�求 aptitude 执行安装时，它会首先显示它将�执行的动作"
 "的概�。"
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "当软件包列表更新�忘记哪些包是“新�的"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
 msgstr ""
 "如果开�此选项，则 aptitude 会在您更新软件包列表�(如按‘u’键)清除新软件列表。"
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "安装或者�载软件包�忘记哪些包是“新�的"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -390,12 +377,12 @@ msgstr ""
 "如果开�此选项，则 aptitude 会在您执行安装或从命令行安装或�载软件包�清除新"
 "软件列表。"
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "当第一个改动是在�读模�下进行时�显示警告。"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -404,11 +391,11 @@ msgstr ""
 "如果此选项%B没有%b开�， aptitude 会在您没有��应用系统修改时修改软件包状�"
 "的时候显示警告。"
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr "在� root 用户试图执行特�命令时�出警告"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -418,11 +405,11 @@ msgstr ""
 "如果开�此选项，aptitude 会在您没有��时试图执行�作的时候警告您；例如，作为"
 "� root 用户安装软件。您�以选择以 root 身份登录并以 root ��执行动作。"
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "记录所执行动作的日志文件"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -433,11 +420,11 @@ msgstr ""
 "第一个字符是管�字符('%B|%b')，剩下的文件�会被识别为接收标准输入日志信�的 "
 "shell 命令。"
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "选择软件包时自动解决�赖关系"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -448,11 +435,11 @@ msgstr ""
 "�赖关系。这将远快于内建的�赖解决方�，但�能会产生并�最优的解决方�或者在"
 "�些情况下彻底失败。"
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "安装或者�载时自动修正破�的软件包"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -462,11 +449,11 @@ msgstr ""
 "如果开�此选项，并且您在有些软件包被破�的时候执行安装， aptitude 会自动应用"
 "问题解决器的当�建议。�则， aptitude 会�示您�赖破�的解决方法。"
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "自动安装推�软件包"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -481,11 +468,11 @@ msgstr ""
 "如果开�此选项并且开�“自动移除未用的软件包�，被所安装包推�安装的包�会被自"
 "动移除。"
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "自动�载未用软件包"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -500,11 +487,11 @@ msgstr ""
 "如果开�此选项并开�“自动安装推�的软件包�，并且有其他已安装的软件包推�它"
 "们，那么自动安装的软件包将�会被移除。"
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "从�自动删除的软件包"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -513,11 +500,11 @@ msgstr ""
 "满足此�索模�的软件包将总是被认为有已安装的软件包�赖它们：它们将�会作为未"
 "用软件包被移除。"
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr "�许�破��或�止的�赖关系解决方案"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -535,15 +522,15 @@ msgstr ""
 "时。aptitude �然会在自动安装被选择安装或�级软件包的�赖是破���规则，原因"
 "请� apt bug #470035。"
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "用户界�选项"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "正在处��赖关系"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "�项"
 
@@ -642,7 +629,7 @@ msgstr "无法找到“%s�的�代�包。\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "无法满足构建�赖：%s。\n"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -651,7 +638,7 @@ msgstr ""
 "注�：“%s�，�供虚拟软件包\n"
 "      “%s�，并且已�被安装。\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -660,7 +647,7 @@ msgstr ""
 "注�：“%s�，�供虚拟软件包\n"
 "      “%s�，已��将被安装。\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -669,77 +656,75 @@ msgstr ""
 "“%s�存在于软件包数�库中，但是它�是一个真实的软件\n"
 "包，而且没有其它软件包�供该软件包。\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "“%s�是一个虚拟软件包，�供者：\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "您必须选择一个�安装。\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "软件包 %s 没有�供安装的候选者"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
 "      virtual package \"%s\"\n"
 msgstr "注�：选择“%s�而�是虚拟软件包“%s�\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s 的 (%s) 版本已�按�求安装了\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s 目�未被安装，所以它�会被�级。\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s 已�安装了最新版本，所以�会�级。\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s 目�未被安装，所以它�会被�新安装。\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "软件包 %s 并未安装，所以�删除\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "软件包 %s 并未安装，�能�止�级\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr "软件包 %s 是���级的，�能设为�止�级\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "注�：选择软件集“%s：%s�安装\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
-msgstr "您�能在“install�或“forbid-version�命令中指定一个软件包的版本。\n"
+"'forbid-version' command"
+msgstr "您�能在“install�或“forbid-version�命令中指定一个软件包的版本"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "在“install�命令中您�能指定一个软件包的存档\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "在“install�命令中您�能指定一个软件包的存档"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
@@ -748,7 +733,7 @@ msgstr ""
 "无法找到软件包“%s�，�时有超过 40 个软件包\n"
 "�称中包�“%s�。\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -757,12 +742,12 @@ msgstr ""
 "无法找到软件包“%s�。然而下列软件包�称中\n"
 "包�“%s�。\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "无法找到任何�称或者�述中匹�“%s�的软件包\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -780,7 +765,7 @@ msgstr ""
 "无法找到任何软件包匹�“%s�。然而下列软件包的�述中\n"
 "包�“%s�：\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "�法的动作字符“%c�\n"
@@ -802,98 +787,83 @@ msgstr "错误"
 msgid "Changelog download failed: %s"
 msgstr "�更日志下载失败：%s"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "无法执行 sensible-pager，这是一个正常�行的 Debian 系统�？"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "%s �是官方 Debian 软件包，无法显示其�更日志。"
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "无法找到 %s 的�更日志"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "无法找到 %s 的�更日志"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: clean 命令�接�任何�数\n"
+msgid "The clean command takes no arguments"
+msgstr "clean 命令�接�任何�数"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "删除 %s* %s 部分 /*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr "无法查阅您的主目录，�存到 /tmp/function_pkgs�"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "删除 %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: autoclean 命令�接�任何�数\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "autoclean 命令�接�任何�数"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "将释放 %sB �盘空间\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "已释放 %sB �盘空间\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "无效的�作 %s"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "在�数“keep-all�之�有�料之外的模�"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
-msgstr "无法安全解决�赖关系，请�试使用 --full-resolver ��行。\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
+msgstr "无法安全解决�赖关系，请�试使用 --full-resolver ��行"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "放弃。\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "下载：您必须指定至少一个�下载的软件包\n"
+msgid "download: you must specify at least one package to download"
+msgstr "下载：您必须指定至少一个�下载的软件包"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "无法读��列表文件"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "无法找到�称为“%s�的软件包"
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -927,30 +897,21 @@ msgid "[Working]"
 msgstr "[正在工作]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
-msgstr "��缓冲�目：需�至少一个�数(需�写入文件的目录)\n"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "没有这个软件包“%s�"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
+msgstr "��缓冲�目：需�至少一个�数(需�写入文件的目录)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr "所给的�索模�未找到软件包；无事��。\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E：forget-new 命令�接�任何�数\n"
+msgid "The forget-new command takes no arguments"
+msgstr "forget-new 命令�接�任何�数"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "将忘记哪些软件包是新的\n"
@@ -1057,17 +1018,17 @@ msgstr "下列软件包将被�级："
 msgid "The following partially installed packages will be configured:"
 msgstr "下列仅部分安装的软件包将被�置："
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "下列“基本�软件包将被“删除��\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "该动作将使下列“基本�软件包“破��：\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1076,16 +1037,16 @@ msgstr ""
 "警告：执行该动作有�能导致您的系统���\n"
 "      “���继续，除�您“完全�了解您正在�什么�\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "我知�这是一个�常糟糕的主�"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "�继续的�，键入�组“%s�：\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1101,7 +1062,7 @@ msgstr ""
 "�有当您�常清楚地了解这就是您所�执行的�作时，�应该进行安装�作。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1110,7 +1071,7 @@ msgstr ""
 "*** 警告 ***  忽略这些��信任机制的问题，因为\n"
 "              %s::CmdLine::Ignore-Trust-Violations 的值为“真��\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1123,7 +1084,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr "Shi"
 
@@ -1132,175 +1093,175 @@ msgstr "Shi"
 #. 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr "Fou"
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "您想忽略这�警告信�并继续执行�？\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "�继续，请键入“%s�；�中止，请键入“%s�："
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "未被识别的输入。请键入“%s�或“%s�。\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "下列软件包被“推��安装但是将“�会�被安装：\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "下列软件包被“建议�安装但是将“�会�被安装：\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "将�会安装，�级或者删除任何软件包。\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu 个软件包被�级，新安装 %lu 个，"
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu 个被�新安装，"
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu 个被�级，"
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu 个将被删除， �时 %lu 个将��级。\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "需�获� %sB/%sB 的存档。"
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "需�获� %sB 的存档。"
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "解包�将�使用 %sB。\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "解包�将释放 %sB。\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "无�显示的软件包 -- 请在“i�之�的那一行输入软件包�称。\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "按回车继续。"
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "未�现软件包 -- 请在“c�之�的那一行输入软件包�称。\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
 "package to justify.\n"
 msgstr "未�现软件包 -- 请输入0个或多个�索内容�接�输入��索的软件包。\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "继续安装"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "放弃并退出"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr "显示一个或者多个软件包的信�；软件包的�字将在字符“i�之�。"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
 msgstr "显示一个或者多个软件包的�更记录；软件包的�字将在字符“c�之�。"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "切�是�显示�赖关系信�"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "切�是�显示软件包的大�"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "切�是�显示版本�"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 msgid ""
 "try to find a reason for installing a single package, or explain why "
 "installing one package should lead to installing another package."
@@ -1308,25 +1269,25 @@ msgstr ""
 "�试寻找安装�个软件包的�由，或解释为什么安装一个软件包会导致安装�一个软件"
 "包。"
 
-#: src/cmdline/cmdline_prompt.cc:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr "�行自动�赖解决器�修正被破�的�赖关系。"
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "进入全�视化界�"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1337,45 +1298,45 @@ msgstr ""
 "软件包的�称(或者模�)。该动作将被实施到您所选择的全部软件包。下列动作�供选"
 "择："
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "按'+'键�安装软件包"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr "按 '+M' 安装软件包并且立�将它们标记为已安装状�"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "按 '-' �载软件包"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "按 '_' 清除软件包"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "按 '=' 将软件包置于��状�"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "按 ':' 将维�软件包当�状�但是并�将其置于��状�"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "按 '&M' 将软件包标记为自动安装"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "按 'm' 将软件包标记为手动安装"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "'&BD' 以安装软件包的编译�赖。"
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1386,47 +1347,47 @@ msgstr ""
 "\"aptitude{u}\"。这些字符�供关于包状�的�外信�，并且�能包�如下的任�组"
 "�："
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 msgid "'a': the package was automatically installed or removed."
 msgstr "'a'：此软件包是自动安装或删除的。"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr "'b'：包的一些�赖被建议的更改破�。"
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr "'p'：此包在删除时也�时清除�置文件。"
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr "'u'：此包将被删除，因为其未被使用。"
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "命令："
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
 msgstr ""
 "aptitude 未能找到这些�赖的解决方法。您�以自己手动解决或输入“n��退出。"
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "您�继续�？[Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "手动解决这些�赖�？ [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "�法�应。请输入一个�法命令或者“?�请求帮助。\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1434,7 +1395,7 @@ msgstr ""
 "输入一个软件包管�命令(例如‘+ 软件包’�安装�个软件包)，‘R’ �试图自动解决�"
 "赖关系或 ‘N’ �中止。"
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1445,7 +1406,7 @@ msgstr ""
 "将显示�赖关系信�。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1456,7 +1417,7 @@ msgstr ""
 "将�显示�赖关系信�。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1467,7 +1428,7 @@ msgstr ""
 "将显示版本�。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1478,7 +1439,7 @@ msgstr ""
 "将�显示版本�。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1489,7 +1450,7 @@ msgstr ""
 "尺寸�化将被显示。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1617,6 +1578,11 @@ msgstr "在“%c��需�至少一个软件包/版本对"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "预期在“%2$s�之�得到版本或“%1$s�"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "没有这个软件包“%s�"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1765,7 +1731,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr "我想解决�赖关系，但没有创建�赖关系解决器"
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1793,7 +1759,7 @@ msgstr "放弃自动�赖解决方案并��到手动解决方案。"
 msgid "The following commands are available:"
 msgstr "下列命令�选："
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "将�赖关系解决状�写入文件："
 
@@ -1825,7 +1791,7 @@ msgstr ""
 "*** 错误：�索因致命异常被中止。您�以继续�索，\n"
 "          但无法找到�些解决方案。"
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1837,24 +1803,23 @@ msgstr ""
 "  你�能通过�高以下�数的值�解决此问题：\n"
 "  Aptitude::ProblemResolver::StepLimit (当�为 %d)。"
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "未能解决此�级的�赖关系：未找到解决方案。"
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "无法解决此更新的�赖关系：%s"
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "用 iconv 转� %s 失败。\n"
+msgid "iconv of %s failed"
+msgstr "用 iconv 转� %s 失败"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "查找：您必须�供至少一个查找项\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "查找：您必须�供至少一个查找项"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1897,7 +1862,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "下列软件包存在未满足的�赖关系：\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2120,7 +2085,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "�供"
 
@@ -2134,15 +2099,9 @@ msgstr "�述："
 msgid "Homepage: "
 msgstr "主页："
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "无法定�软件包 %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "无法分�模� %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "没有�现匹�的软件包"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2153,14 +2112,13 @@ msgstr "将�下载/安装/�载软件包。\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "内部错误，排�未完�"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "删除过期的下载文件"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: update 命令�接�任何�数\n"
+msgid "The update command takes no arguments"
+msgstr "update 命令�接�任何�数"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2177,118 +2135,140 @@ msgstr "将用户标签“%s�移除出软件包“%s�。\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr "%s: �数太少；期待至少一个标签�称和一个软件包�称。\n"
 
-#: src/cmdline/cmdline_util.cc:167
-#, c-format
-msgid "No candidate version found for %s\n"
-msgstr "未�现 %s 的候选版本\n"
-
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "未�现 %s 的已安装或候选版本\n"
+msgid "No candidate version found for %s"
+msgstr "未�现 %s 的候选版本"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "无法找到存档“%s�，该存档用于软件包“%s�\n"
+msgid "No current or candidate version found for %s"
+msgstr "未�现 %s 的已安装或候选版本"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "无法找到“%s�版本的软件包“%s�\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "无法找到存档“%s�，该存档用于软件包“%s�"
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "内部错误：�法的数值 %i 被传递给 cmdline_find_ver�\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "无法找到“%s�版本的软件包“%s�"
 
-#: src/cmdline/cmdline_util.cc:239
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "您�能为一个软件包�时指定存档和版本�\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "内部错误：�法的数值 %i 被传递给 cmdline_find_ver�"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "无法找到 %s 的�更日志"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "您�能为一个软件包�时指定存档和版本�"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d 个被破� [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d 个被更新 [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d 个新软件包 [%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "当�状�：%F。"
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "有 %d 个新被废弃的软件包。"
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "有 %d 个新被废弃的软件包："
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "标签�“%s��没有逗�"
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "无法定�软件包 %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "无法找到 %s 的�更日志"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "注�：选择软件集“%s：%s�安装\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "无法找到 %s 的�更日志"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, c-format
 msgid "Package %s:"
 msgstr "软件包 %s："
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, c-format
 msgid "Source package %s:"
 msgstr "��包 %s："
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, c-format
 msgid "Archive %s:"
 msgstr "存档 %s："
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr "--group-by|archive"
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr "--group-by|auto"
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr "--group-by|none"
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr "--group-by|package"
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr "--group-by|source-package"
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr "--group-by|source-version"
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
@@ -2296,10 +2276,9 @@ msgid ""
 msgstr ""
 "无效的软件包分组模� %s (应为 auto�none�pacakge 或 source-package 之一)"
 
-#: src/cmdline/cmdline_versions.cc:584
-#, c-format
-msgid "versions: You must provide at least one package selector\n"
-msgstr "版本：您必须�供至少一个查找项\n"
+#: src/cmdline/cmdline_versions.cc:578
+msgid "versions: You must provide at least one package selector"
+msgstr "版本：您必须�供至少一个查找项"
 
 #: src/cmdline/cmdline_why.cc:290
 msgid "dep_level"
@@ -2321,7 +2300,7 @@ msgstr "当�"
 msgid "Candidate"
 msgstr "候选"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "安装"
 
@@ -2423,21 +2402,19 @@ msgstr "未能找到�由以安装 %s。\n"
 msgid "Packages requiring %s:"
 msgstr "�求 %s 的软件包："
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "�称为“%s�的软件包的软件包�存在。"
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "无法分��些匹�模�"
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
-msgstr "%s：这个命令�求至少一个�数(�查询的软件包)。\n"
+msgid "%s: this command requires at least one argument (the package to query)"
+msgstr "%s：这个命令�求至少一个�数(�查询的软件包)"
 
 #: src/cmdline/cmdline_why.h:212
 msgid "Unknown version selection, something is very wrong."
@@ -2463,11 +2440,11 @@ msgstr "未满足"
 msgid "UNAVAILABLE"
 msgstr "��用"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "标签"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "用户标签"
 
@@ -2665,32 +2642,32 @@ msgstr ""
 "无法�定缓存文件；这通常�味� dpkg 或�一个 apt 工具已�在安装软件包。正在以"
 "�读方�打开；您对软件包状�所作的任何改�都“�会�被�存�"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 msgid "allowed"
 msgstr "�许的选择"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "主�"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2758,34 +2735,42 @@ msgid ""
 msgstr ""
 "无效的安全级别 %s (�是 discard�minimum�maximum�minimum 或一个整数)。"
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr "软件包 cache ��用；无法下载并安装软件包。"
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "内部错误：无法生�下载软件包列表"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "无法下载 %s：%s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"有几个软件包无法下载，您�以�行 aptitude update 或者加上 --fix-missing 的选"
+"项�试试？"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "无法修正因软件包��用而造�的错误"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "软件包安装失败。正在试图��："
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr "无法�新获得系统��(也许�一个 apt 或 dpkg 正在�行？)"
@@ -2933,13 +2918,13 @@ msgstr ""
 "\n"
 "日志完�。\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr "正在访问索引"
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 msgid "Filtering packages"
 msgstr "分类软件包"
 
@@ -3048,18 +3033,18 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "软件包索引文件被��。软件包 %s 无 Filename：域。"
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "%s 的�更日志"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "下载�更日志失败：%s"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "下载�更日志失败：预期之外的异常。"
 
@@ -3107,25 +3092,26 @@ msgstr "无法创建输出文件：�进程以状� %d 退出。"
 msgid "Failed to parse the cost settings string: %s"
 msgstr ""
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "创建标签数�库"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr "�旧"
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 msgid "No tag descriptions are available."
 msgstr "无�用的标签�述。"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, c-format
 msgid "No description available for %s."
 msgstr "%s 无�用�述。"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr "�旧"
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3268,39 +3254,39 @@ msgstr "Aptitude 包管�器"
 msgid "_File"
 msgstr "文件(_F)"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "执行所有等待执行的安装和�载任务"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "正在检查新版本的软件包"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "为所有未被��现状的软件包加上�级标记"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "忘记哪些软件包是“新�的"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "执行所有等待执行的安装��载���和�级任务"
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "删除以�下载的软件包文件"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "删除无法�下载的软件包文件"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "�新载入软件包缓存"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3308,7 +3294,7 @@ msgstr "�新载入软件包缓存"
 msgid "Restart the program as root; your settings will be preserved"
 msgstr "�行“su��为 root。这将�新�动程�，但是您的设置将会被�存下�。"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "退出此程�"
 
@@ -3316,7 +3302,7 @@ msgstr "退出此程�"
 msgid "E_dit"
 msgstr "退出(_D)"
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "撤销最近一次或者一组软件包�作"
 
@@ -3347,7 +3333,7 @@ msgid "_Help"
 msgstr "帮助(_H)"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr "状�显示器"
 
@@ -3355,19 +3341,19 @@ msgstr "状�显示器"
 msgid "Update"
 msgstr "æ›´æ–°"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "软件包"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "预览"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "解决手段"
 
@@ -3538,7 +3524,7 @@ msgid "Fix Manually"
 msgstr "手动修�"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "�级"
 
@@ -4045,11 +4031,11 @@ msgstr "已安装"
 msgid "Reinstall"
 msgstr "�新安装"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "�级"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "删除"
 
@@ -4081,7 +4067,7 @@ msgstr "�更新软件包列表，需�是 root。"
 msgid "Download already running."
 msgstr "下载已�在进行。"
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "已�开始了一个软件包列表更新或者安装的动作。"
 
@@ -4144,40 +4130,40 @@ msgstr "软件包 %s 中有错误"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "询问是�替��置文件 %s"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "正在下载软件包"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 msgid "Broken packages"
 msgstr "破�的软件包"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 msgid "Show broken packages"
 msgstr "显示破�的软件包"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 msgid "Resolve dependencies"
 msgstr "解决�赖关系"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "%d 个包已��。"
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 msgid "View changes"
 msgstr "查看更改"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 msgid "Apply changes"
 msgstr "应用更改"
 
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4186,59 +4172,59 @@ msgstr[0] "安装 %d 个包"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "删除 %d 个软件包"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, c-format
 msgid "Download size: %sB."
 msgstr "下载大�：%sB。"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr "%s 的标记：\n"
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr "此功能尚未实现。"
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 msgid "Not implemented"
 msgstr "未实现"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 msgid "Install/Upgrade"
 msgstr "安装/�级"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 msgid "Purge"
 msgstr "清除\t"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "��"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "��"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr "设为自动"
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 msgid "Set as manual"
 msgstr "设为手动"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr "切�自动状�"
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr "无法加载用户界�定义文件 %s/aptitude.glade。"
@@ -4273,7 +4259,7 @@ msgstr "信�"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4317,15 +4303,15 @@ msgstr "%s 将被手动安装"
 msgid "Cache reloading, please wait..."
 msgstr "正在�新加载缓存，请�候..."
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 msgid "Searching..."
 msgstr "�索..."
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 msgid "Finalizing view"
 msgstr "最终视图"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "编译视图"
@@ -4996,108 +4982,109 @@ msgstr "未知的对�类型“%s�"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "按�称排�的策略�需��数"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "无效零长度排�策略�"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "排�策略�述中�匹�的“(�"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "无效的排�策略类型“%s�"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "无法对“%ls�之�的多字节字符串进行解�"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "无法对“%s�之�的宽字符串进行解�"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s 编译于 %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "编译器：g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "所用编译器：\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt 版本 %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "  NCurses 版本：未知\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "  NCurses 版本：%s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "  libsigc++ 版本：%s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  Ept 支�已开�。\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  Ept 支�已�用\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  Gtk+ 版本 %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  Gtk-- 版本 %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  Gtk+ 支�已�用\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s 编译于 %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  Qt 支�已�用\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5105,32 +5092,32 @@ msgstr ""
 "\n"
 "当�库版本：\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "  NCurses 版本：%s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "  cwidget 版本：%s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "  Apt 版本：%s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "用法： aptitude [-S 文件�] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [选项] <动作> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5139,118 +5126,118 @@ msgstr ""
 "  动作 (如果未指定，aptitude 将进入交互模�)：\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - 安装/�级软件包。\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - �载软件包。\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - �载软件包并删除其�置文件。\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - 将软件包置于��状�。\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - �消对一个软件包的��命令。\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - 将软件包标记为已�自动安装。\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - 将软件包标记为已�手动安装。\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr " forbid-version - �止 aptitude �级到�一特定版本的软件包。\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - 下载新/��级软件包列表。\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - 执行一次安全的�级。\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
 msgstr " full-upgrade - 执行�级，�能会安装和�载软件包。\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr " build-dep    - 安装软件包的编译�赖。\n"
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - 忘记哪些软件包是“新�的。\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - 按�称 和/或 表达��索软件包。\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show       - 显示一个软件包的详细信�。\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show       - 显示一个软件包的详细信�。\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - 删除已下载的软件包文件。\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - 删除旧的已下载软件包文件。\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - 查看一个软件包的�更日志。\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - 下载软件包的 .deb 文件。\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
 msgstr " reinstall    - 下载并(�能)�新安装一个现在已�安装了的软件包。\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, fuzzy, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5260,7 +5247,7 @@ msgstr ""
 " why       - 显示需��一软件包的手动安装的软件包，或者\n"
 "              为什么一个或多个软件包需�给定的软件包。\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5271,203 +5258,203 @@ msgstr ""
 " why-not     - 显示导致与给定软件包包冲�的手动安装的包，或者为什么\n"
 "                 如果安装一个或多个软件包会导致与给定软件包冲�。\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  选项：\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             此帮助文本。\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr " --gui          �使�置中�用了，也�使用 GTK 图形用户界�。\n"
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr " --no-gui       �使�用，也�使用 GTK 图形用户界�。\n"
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " --qt           使用 Qt 图形界�。\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr " --no-qt        ��使用 Qt 图形界�，�使在�置中�用。\n"
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             模拟动作，但是并�真正执行。\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr " -d             仅仅下载软件包，�安装或者�载任何东西。\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, fuzzy, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             总是�示确认执行动作。\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             �设对简�的 yes/no 问题回答“yes�。\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
 msgstr " -F 格�        指定显示�索结果的格�；��手册。\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
 msgstr " -O 次�        指定如何排列显示�索结果；��手册。\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w 宽度        指定显示�索结果的格�宽度。\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             积�地�试修���的软件包。\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             显示就�安装的软件包版本。\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             显示自动改�的软件包的�赖关系\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    显示�个软件包的安装尺寸的�化。\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
 msgstr " -v             显示附加信�。(�能会�供多次)。\n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [release]   设置将�从中安装软件包的�布版本。\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, fuzzy, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr " -q            在命令行状�下，�显示增�进度指示器。\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=val     直接设置�为“key�的�置选项。\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, fuzzy, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies.\n"
 msgstr " --with(out)-recommends\t指定是�将推�处�为强�赖关系。\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S fname       从文件�中读� aptitude 的扩展状�信�。\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             开始�行时下载新的软件包列表。\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr "                  (�有终端界�)"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             开始�行时执行安装。\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  这个 aptitude 没有超级牛力。\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 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:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 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:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 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:408
+#: src/main.cc:374
 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:411
+#: src/main.cc:377
 msgid "off"
 msgstr "关闭"
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
@@ -5476,77 +5463,57 @@ msgstr ""
 "未知的日志级别�“%s� (�用的值有 \"trace\", \"debug\", \"info\", \"warn\", "
 "\"error\", \"fatal\", or \"off\")。"
 
-#: src/main.cc:488
-#, c-format
-msgid "Invalid logger name \"%s\"."
-msgstr "无效日志记录� %s。"
-
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "在 -q= 之�需�一个数字\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "在 -q= 之�需�一个数字，但�得到 %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o �求�数格�为 key=val，�接�到 %s\n"
-
-#: src/main.cc:888
+#: src/main.cc:456
 #, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "标签�“%s��没有逗�。\n"
+msgid "Invalid logger name \"%s\""
+msgstr "无效日志记录� %s"
 
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "“诡异�：收到未知的选项代�\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr "--show-package-names|never"
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr "--show-package-names|auto"
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr "--show-package-names|always"
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr "无效的软件包�称显示模� %s (应为 never�auto 或 always 之一)。"
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr "无摘�"
 
-#: src/main.cc:1027
+#: src/main.cc:781
 msgid "first-package"
 msgstr "首个软件包"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr "首个软件包�类型"
 
-#: src/main.cc:1031
+#: src/main.cc:785
 msgid "all-packages"
 msgstr "全部包"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr "全部软件包��赖版本"
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5557,36 +5524,40 @@ msgstr ""
 "\"，\"first-package-and-type\"，\"all-packages\" 或 \"all-packages-with-dep-"
 "versions\"。"
 
-#: src/main.cc:1079
+#: src/main.cc:831
+#, fuzzy
+#| msgid ""
+#| "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may "
+#| "be specified\n"
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr ""
 "选项 --auto-clean-on-startup，--clean-on-startup，-i 和 -u �能指定一个\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
+#, fuzzy
+#| msgid ""
+#| "-u, -i, and --clean-on-startup may not be specified in command-line mode "
+#| "(eg, with 'install')"
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr ""
 "选项 -u，-i 和 --clean-on-startup �能在命令行模�中指定 (例如，和“install�一"
 "èµ·)"
 
-#: src/main.cc:1105
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "选项 -u，-i 和 --clean-on-startup �能在和一个命令一起指定 "
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "未知的命令“%s�\n"
+msgid "Unknown command \"%s\""
+msgstr "未知的命令“%s�"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "未知的例外：%s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5604,7 +5575,7 @@ msgstr "�索："
 msgid "Search backwards for: "
 msgstr "���索："
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "扫雷"
 
@@ -5813,7 +5784,7 @@ msgstr "mine-help.txt çš„ç¼–ç �|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "软件包"
 
@@ -5894,8 +5865,8 @@ msgstr "<��用>"
 msgid "<none>"
 msgstr "<æ— >"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "虚拟"
@@ -6029,7 +6000,7 @@ msgstr "在“%ls�之�无法转�软件包显示格�"
 msgid "Internal error: Default column string is unparsable"
 msgstr "内部错误：默认�字符串无法解�"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "软件集"
 
@@ -6180,11 +6151,11 @@ msgstr "匹�索引必须大于等于 1，而�是“%s�"
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "匹�索引 %ls 太大了；�用的组为 (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "没有标签的软件包"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6194,10 +6165,6 @@ msgstr ""
 "这些软件包还没有在 debtags 中文类，或者 debtags 数�库�存在(安装 debtags 也"
 "许能修正这个问题)。"
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "标签缺失"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "��软件包："
@@ -6776,7 +6743,7 @@ msgstr "载入缓存"
 msgid "Really quit Aptitude?"
 msgstr "真的�退出 Aptitude �？"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "修改 aptitude 的行为"
 
@@ -6855,7 +6822,7 @@ msgstr ""
 msgid "License"
 msgstr "许��"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "查看您�以在何��款下拷�和分� aptitude"
 
@@ -6876,7 +6843,7 @@ msgstr "在线帮助"
 msgid "View a brief introduction to aptitude"
 msgstr "观看 aptitude 的简�介�"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "帮助"
 
@@ -6906,7 +6873,7 @@ msgstr "手册"
 msgid "FAQ"
 msgstr "常�问题回答"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "查看常�问题列表"
 
@@ -6944,15 +6911,15 @@ msgstr ""
 "�以安装的删除。%n%n您�删除这些目录和里�的内容�？如果您选择“��，您将�会"
 "�看到这�信�。"
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "查看软件包下载的进程"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "软件包下载"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -6963,61 +6930,61 @@ msgstr ""
 "系统安全%b。�有当您�常清楚地了解这就是您所�执行的�作时，�应该进行安装�"
 "作。%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr " %S*%N %s [版本� %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "真的继续"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "中止安装"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "预览软件包安装"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "查看以�/或者调整将�被执行的动作"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "�些破�的包已�被修补:"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "这些�赖关系没有解决方案�"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "试图�寻解决方案时用时已尽 (按“%s�加把劲儿�试试)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 "安装/删除软件包需�管�员��，而您现在没有这���。您想�进入 root ���？"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "�� root"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "��� root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "没有任何软件包被设定为安装，删除或者�级。"
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7026,231 +6993,231 @@ msgstr ""
 "没有任何软件包将被安装，删除或者�级。�些软件包�以�级，但是您没有选择将它"
 "们�级。输入“U�以准备�级。"
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "正在更新软件包列表"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "查看软件包列表更新的进程"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "列表更新"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 "更新软件包列表需�管�员��，而您现在没有这���。您想�进入 root ���？"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "通过扫雷�消磨时间"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "在下载进行过程中��许执行清除"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "删除下载的文件"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "下载的文件已�被删除"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 "清�软件包缓存需�管�员��，而您现在没有这���。您想�进入 root ���？"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "软件包缓存��用：无法 auto-clean 。"
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "过期的下载文件已�被删除，正在释放 %sB 的�盘空间。"
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 "删除废弃文件需�管�员��，而您现在没有这���。您想�进入 root ���？"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "没有更多的解决方案了。"
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "未能找到解决方案以实施。"
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "寻求解决方案时耗尽了时�。"
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "解决�赖关系"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "为未满足的�赖关系寻找解决方案"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "无法打开 %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "存储�赖关系解决状�时出错"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "安装/�载软件包(^I)"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "更新软件包列表(^U)"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "标记��级的(^g)"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "忘记新软件包(^F)"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "�消待执行的动作(^E)"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "清除软件包缓存(^C)"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "关闭过期文件(^O)"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "�新载入软件包缓存(^R)"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "玩扫雷游�(^P)"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "�� root (^B)"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "退出(^Q)"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "撤消"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "安装(^I)"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "标记当�选择的软件包以安装或者�级"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "删除(^R)"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "标记当�选择的软件包以删除"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "清除(^P)"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "标记当�选择的软件包和它的�置文件以删除"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "��(^K)"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "�消选定软件包上的任何动作"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "��(^H)"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "�消选定软件包上的任何动作，并且�护它�于以�被�级"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "标记为自动安装(^A)"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 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:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "标记为手动安装(^M)"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 "将所选定的软件包标记为手动安装；除�您手动删除该软件包，�则它将�会被删除"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "�止版本(^F)"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 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:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "信�(^N)"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "显示关于选定软件包上的更多信�"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "循环软件包信�"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7259,324 +7226,324 @@ msgstr ""
 "在软件包信�区域模�中循环：它�以显示软件包的长篇说明，�赖状�的概�，或者"
 "分�为什么该软件包是必须的。"
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "�更日志(^C)"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "显示选定软件包上的�更日志"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "检查解决方案(^E)"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "检查当�选择的处��赖问题的解决方案"
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "应用解决方案(^S)"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "确认当�选择的解决方案中包�的动作。"
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "下一个解决方案(^N)"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "选择解决此�赖问题的下一个方案。"
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "�一个解决方案(^P)"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "选择解决此�赖问题的�一个方案。"
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "第一个解决方案(^F)"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "选择解决此�赖问题的第一个方案。"
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "最�一个解决方案(^L)"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "选择当�已�生�的解决此�赖问题的最�一个方案。"
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "放弃(^R)"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "切�是�放弃当�选择的动作。"
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "确认(^A)"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "切�当�选择的动作是�被�许。"
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "查看目标(^V)"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "查看会被所选的动作影�的软件包"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "拒�破� ^Holds"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr "拒�所有会改���软件包或安装�止版本的动作。"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "查找(^F)"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "���索"
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "��查找(^F)"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "���索"
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "继续查找(^A)"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "��上一次查找"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "��继续查找(^B)"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "����上一次查找"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "�制显示(^L)"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "使用过滤器过滤软件包列表"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "�消显示�制(^U)"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "�消软件包列表中过滤器的效果"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "�寻��(^F)"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "下列软件包存在未满足的�赖关系："
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "首选项(^P)"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "用户界�选项(^U)"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "修改影�用户界�的设置"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "处��赖关系(^D)"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "改�影�处��赖关系的设置"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "�项(^M)"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "改�程�的�项设置"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "还原选项(^R)"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "把所有项目�设为它们的默认值"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "下一个(^N)"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "查看下一个画�"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "上一个(^P)"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "查看上一画�"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "关闭(^C)"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "关闭此画�"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "新建软件包视图(^V)"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "创建新的默认软件包视图"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "检查推�结果(^R)"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr "查看推�您安装，但是现在尚未安装的软件包。"
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "新建平�软件包列表(^F)"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "在一个未分类的列表中查看系统中的所有的软件包"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "新建 Debtags �览器(^D)"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "用 Debtags 的信���览软件包"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "新建分类�览器(^B)"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "分类�览软件包"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "关于(^A)"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "查看关于此程�的信�"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "帮助(^H)"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "查看在线帮助"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "用户手册(^M)"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "查看详细的程�使用手册"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "常�问题回答(^F)"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "æ–°é—»(^N)"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "查看其�一版本中所�的�大修改："
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "许��(^L)"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "动作"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "�索"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "选项"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "视图"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr "%ls：��  %ls：帮助  %ls：退出  %ls：更新  %ls：下载/安装/删除软件包"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -7604,9 +7571,46 @@ msgstr "下载 %s 的�更日志失败：%s"
 msgid "Downloading the changelog of %s"
 msgstr "正在下载 %s 的�更日志"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "您�能查看官方 Debian 软件包的�更日志。"
+#~ msgid "MISSING TAG"
+#~ msgstr "标签缺失"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "用于下载�更日志的 URL"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "此选项控制用�从 Debian 网站下载更新日志的模�。您仅需�在更新日志移动到�"
+#~ "�的 URL 时修改这个选项。"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr "%s �是官方 Debian 软件包，无法显示其�更日志。"
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "无法找到�称为“%s�的软件包"
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "无法分�模� %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "在 -q= 之�需�一个数字\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "在 -q= 之�需�一个数字，但�得到 %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o �求�数格�为 key=val，�接�到 %s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "“诡异�：收到未知的选项代�\n"
+
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "选项 -u，-i 和 --clean-on-startup �能在和一个命令一起指定 "
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "您�能查看官方 Debian 软件包的�更日志。"
 
 #~ msgid "Err "
 #~ msgstr "错误 "
@@ -7771,9 +7775,6 @@ msgstr "您�能查看官方 Debian 软件包的�更日志。"
 #~ msgid "Tier: %s"
 #~ msgstr "触�器：%s"
 
-#~ msgid "No changelog found."
-#~ msgstr "未�现�更日志"
-
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "无法创建临时文件：%s"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index f753c5af..4e15606b 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 51434fa2..f71fde84 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aptitude\n"
 "Report-Msgid-Bugs-To: aptitude@packages.debian.org\n"
-"POT-Creation-Date: 2012-06-03 11:30+0800\n"
+"POT-Creation-Date: 2012-06-30 22:50+0800\n"
 "PO-Revision-Date: 2012-02-23 16:55+0800\n"
 "Last-Translator: Asho Yeh <ashoyeh@gmail.com>\n"
 "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@ -335,35 +335,22 @@ msgstr ""
 "有套件。"
 
 #: src/apt_options.cc:293
-msgid "URL to use to download changelogs"
-msgstr "用於下載變更日誌的 URL"
-
-#: src/apt_options.cc:294
-msgid ""
-"This option controls the template that's used to download changelogs from "
-"the Debian Web site.  You should only need to change this if the changelogs "
-"move to a different URL."
-msgstr ""
-"該�項控制著從 Debian 官網下載更新記錄的樣�格�。如果更新記錄變更網路連�"
-"時，您必須修改該項目。"
-
-#: src/apt_options.cc:300
 msgid "Display a preview of what will be done before doing it"
 msgstr "在實際執行動作�顯示將執行動作的�覽"
 
-#: src/apt_options.cc:301
+#: src/apt_options.cc:294
 msgid ""
 "If this option is enabled, then when you ask aptitude to perform an install "
 "run, it will first display a summary of the actions it is going to perform."
 msgstr ""
 "加入該�項時，當你�求 aptitude 執行安�時，它會先顯示�將進行的動作大綱。"
 
-#: src/apt_options.cc:307
+#: src/apt_options.cc:300
 msgid ""
 "Forget which packages are \"new\" whenever the package lists are updated"
 msgstr "當套件列表更新後忽略哪些套件是“新�的"
 
-#: src/apt_options.cc:308
+#: src/apt_options.cc:301
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you update the package lists (e.g., by pressing 'u')."
@@ -371,12 +358,12 @@ msgstr ""
 "加入該�項時，在您更新套件列表後(按下'u')，aptitude 將會清除新加入的套件列"
 "表。"
 
-#: src/apt_options.cc:313
+#: src/apt_options.cc:306
 msgid ""
 "Forget which packages are \"new\" whenever packages are installed or removed"
 msgstr "安�或者移除套件後忽略哪些套件是“新�的"
 
-#: src/apt_options.cc:314
+#: src/apt_options.cc:307
 msgid ""
 "If this option is enabled, then aptitude will clear the list of new packages "
 "after you perform an install run or install or remove packages from the "
@@ -385,12 +372,12 @@ msgstr ""
 "加入該�項時，在您從命令列進行安�或移除套件時，aptitude 將會清除新加入的套件"
 "列表。"
 
-#: src/apt_options.cc:320
+#: src/apt_options.cc:313
 msgid ""
 "Do not display a warning when the first change is made in read-only mode"
 msgstr "當第一個更動是在唯讀模�下進行時�顯示警告。"
 
-#: src/apt_options.cc:321
+#: src/apt_options.cc:314
 msgid ""
 "If this option is %Bnot%b enabled, aptitude will display a warning when you "
 "modify the state of a package if you do not have permissions to apply the "
@@ -399,11 +386,11 @@ msgstr ""
 "加入%B而�%b�項後，如果您沒有更動系統的權�，在修改套件狀態時，aptitude 將會"
 "顯示警告訊�。"
 
-#: src/apt_options.cc:327
+#: src/apt_options.cc:320
 msgid "Warn when attempting to perform a privileged action as a non-root user"
 msgstr "在� root 用戶試圖執行特權命令時發出警告"
 
-#: src/apt_options.cc:328
+#: src/apt_options.cc:321
 msgid ""
 "If this option is enabled, aptitude will warn you when you attempt to "
 "perform an action which you do not have permission to do: for instance, "
@@ -413,11 +400,11 @@ msgstr ""
 "加入該�項時，當您沒有�當的權�時，aptitude會�出警告。舉例來說，以� root "
 "的使用者安�套件。您�以改用 root 登錄並以 root 權��作。"
 
-#: src/apt_options.cc:337
+#: src/apt_options.cc:330
 msgid "File to log actions into"
 msgstr "記錄所執行動作的日誌檔案"
 
-#: src/apt_options.cc:338
+#: src/apt_options.cc:331
 msgid ""
 "When you install or remove packages, a summary of what aptitude does will be "
 "written to this file.  If the first character of the file name is a pipe "
@@ -428,11 +415,11 @@ msgstr ""
 "管線字元('%B|%b')，剩餘的字串會被解譯� shell 指令，也就是指由標準輸入�得記"
 "錄資訊。"
 
-#: src/apt_options.cc:350
+#: src/apt_options.cc:343
 msgid "Automatically resolve dependencies of a package when it is selected"
 msgstr "�擇套件時自動解決�賴關係"
 
-#: src/apt_options.cc:351
+#: src/apt_options.cc:344
 msgid ""
 "If this option is enabled, aptitude will use a simple heuristic to "
 "immediately resolve the dependencies of each package you flag for "
@@ -442,11 +429,11 @@ msgstr ""
 "加入該�項時，aptitude 將會使用簡單的嘗試錯誤方法來立�解決欲安�套件的相��"
 "題。這方�比內建的相�解決器更快速，但�能在�些情�下發生錯誤。"
 
-#: src/apt_options.cc:359
+#: src/apt_options.cc:352
 msgid "Automatically fix broken packages before installing or removing"
 msgstr "安�或者移除時自動修正毀斷的套件"
 
-#: src/apt_options.cc:360
+#: src/apt_options.cc:353
 msgid ""
 "If this option is enabled, and you perform an install run while some "
 "packages are broken, aptitude will automatically apply the current "
@@ -456,11 +443,11 @@ msgstr ""
 "加入該�項時，當您進行安�且部份套件是�毀時，aptitude 將自動套用目�解決器的"
 "建議。�則 aptitude 會詢�您�毀的相�關係的解救方�。"
 
-#: src/apt_options.cc:367
+#: src/apt_options.cc:360
 msgid "Install recommended packages automatically"
 msgstr "自動安�推薦的套件"
 
-#: src/apt_options.cc:368
+#: src/apt_options.cc:361
 msgid ""
 "If this option is enabled and \"automatically resolve dependencies\" is also "
 "enabled, aptitude will attempt to install the recommendations of newly "
@@ -475,11 +462,11 @@ msgstr ""
 "如果加入該�項以�“自動移除未用套件�自動安�推薦的套件�項時，先�安�的被推"
 "薦套件將�會自動移除。"
 
-#: src/apt_options.cc:380
+#: src/apt_options.cc:373
 msgid "Remove unused packages automatically"
 msgstr "自動移除未用套件"
 
-#: src/apt_options.cc:381
+#: src/apt_options.cc:374
 msgid ""
 "If this option is enabled, packages that are automatically installed and "
 "that no manually installed package depends on will be removed from the "
@@ -493,11 +480,11 @@ msgstr ""
 "如果該�項�立且\"自動安�推薦的套件\"也�立，當已安�的套件推薦時，這些自動"
 "安�的套件並�會被刪除。"
 
-#: src/apt_options.cc:392
+#: src/apt_options.cc:385
 msgid "Packages that should never be automatically removed"
 msgstr "�應被自動移除的套件"
 
-#: src/apt_options.cc:393
+#: src/apt_options.cc:386
 msgid ""
 "Packages matching this search pattern will always be treated as if an "
 "installed package depends on them: they will never be targeted for removal "
@@ -506,11 +493,11 @@ msgstr ""
 "符�該���則的套件將被視為，當一個已安�的套件相�於它們時，它們決�會被標"
 "記�移除或�需�的套件。"
 
-#: src/apt_options.cc:398
+#: src/apt_options.cc:391
 msgid "Allow dependency resolutions that break holds or forbids"
 msgstr "�許相�解決器破壞�留或�止的套件"
 
-#: src/apt_options.cc:399
+#: src/apt_options.cc:392
 msgid ""
 "If this option is enabled, then whenever aptitude solves a dependency "
 "problem, it will consider modifying held packages, or installing forbidden "
@@ -528,15 +515,15 @@ msgstr ""
 "�或�級指定套件並自動安�符�套件相�性的軟體時，aptitude �然會破壞被設為�"
 "留的套件，原因請看 apt 臭蟲編號 #470035"
 
-#: src/apt_options.cc:525
+#: src/apt_options.cc:518
 msgid "UI options"
 msgstr "使用者介��項"
 
-#: src/apt_options.cc:527
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr "處�相�關係"
 
-#: src/apt_options.cc:529 src/pkg_grouppolicy.cc:1064
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:1064
 msgid "Miscellaneous"
 msgstr "雜項"
 
@@ -635,7 +622,7 @@ msgstr "無法找到 \"%s\" 的原始碼檔案。\n"
 msgid "Unable to satisfy the build-depends: %s.\n"
 msgstr "無法滿足%s套件的編譯相�關係"
 
-#: src/cmdline/cmdline_action.cc:249
+#: src/cmdline/cmdline_action.cc:253
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -644,7 +631,7 @@ msgstr ""
 "附註: \"%s\", �供虛擬套件\n"
 "      \"%s\", 已經安�.\n"
 
-#: src/cmdline/cmdline_action.cc:256
+#: src/cmdline/cmdline_action.cc:262
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
@@ -653,7 +640,7 @@ msgstr ""
 "附註: \"%s\", �供虛擬套件\n"
 "      \"%s\", �將準備安�.\n"
 
-#: src/cmdline/cmdline_action.cc:278
+#: src/cmdline/cmdline_action.cc:290
 #, c-format
 msgid ""
 "\"%s\" exists in the package database, but it is not a\n"
@@ -662,17 +649,23 @@ msgstr ""
 "\"%s\" 存在套件資料庫，但它�是一個真正的套件，\n"
 "而且沒有套件�供�代它。\n"
 
-#: src/cmdline/cmdline_action.cc:286
+#: src/cmdline/cmdline_action.cc:299
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr "\"%s\" 是一個虛擬套件，由以下套件所�供:\n"
 
-#: src/cmdline/cmdline_action.cc:289
+#: src/cmdline/cmdline_action.cc:302
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr "你必須至少�擇一個來安�。\n"
 
-#: src/cmdline/cmdline_action.cc:297
+#: src/cmdline/cmdline_action.cc:304
+#, fuzzy, c-format
+#| msgid "Package %s is not installed, cannot forbid an upgrade\n"
+msgid "Package '%s' has no installation candidate"
+msgstr "Package %s 未安�, 無法�級\n"
+
+#: src/cmdline/cmdline_action.cc:313
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
@@ -681,69 +674,62 @@ msgstr ""
 "附註: �擇 \"%s\" 以�代\n"
 "      虛擬套件 \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:318
+#: src/cmdline/cmdline_action.cc:338
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr "%s 已經安�為被�求的版本 (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:328
+#: src/cmdline/cmdline_action.cc:348
 #, fuzzy, c-format
 msgid "%s is not currently installed, so it will not be upgraded.\n"
 msgstr "%s 尚未安�，因此�會被�新安�。\n"
 
-#: src/cmdline/cmdline_action.cc:332
+#: src/cmdline/cmdline_action.cc:352
 #, fuzzy, c-format
 msgid ""
 "%s is already installed at the latest version, so it will not be upgraded.\n"
 msgstr "%s 已經安�為被�求的版本 (%s)\n"
 
-#: src/cmdline/cmdline_action.cc:338
+#: src/cmdline/cmdline_action.cc:358
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr "%s 尚未安�，因此�會被�新安�。\n"
 
-#: src/cmdline/cmdline_action.cc:346 src/cmdline/cmdline_action.cc:353
+#: src/cmdline/cmdline_action.cc:366 src/cmdline/cmdline_action.cc:373
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr "Package %s 未安�, 因此它將�會移除\n"
 
-#: src/cmdline/cmdline_action.cc:372
+#: src/cmdline/cmdline_action.cc:392
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr "Package %s 未安�, 無法�級\n"
 
-#: src/cmdline/cmdline_action.cc:375
+#: src/cmdline/cmdline_action.cc:395
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 "Package %s 將�會�級, 無法�級\n"
 "\n"
 
-#: src/cmdline/cmdline_action.cc:480
-#, c-format
-msgid "Note: selecting the task \"%s: %s\" for installation\n"
-msgstr "附註: �擇安�作業 \"%s: %s\"\n"
-
-#: src/cmdline/cmdline_action.cc:510
-#, c-format
+#: src/cmdline/cmdline_action.cc:501
 msgid ""
 "You can only specify a package version with an 'install' command or a "
-"'forbid-version' command.\n"
-msgstr "您�能在“install�或“forbid-version�命令中指定一個套件的版本。\n"
+"'forbid-version' command"
+msgstr "您�能在“install�或“forbid-version�命令中指定一個套件的版本"
 
-#: src/cmdline/cmdline_action.cc:519
-#, c-format
-msgid "You can only specify a package archive with an 'install' command.\n"
-msgstr "您�能使用 'install' 指令指定套件歸檔\n"
+#: src/cmdline/cmdline_action.cc:508
+msgid "You can only specify a package archive with an 'install' command"
+msgstr "您�能使用 'install' 指令指定套件歸檔"
 
-#: src/cmdline/cmdline_action.cc:557
+#: src/cmdline/cmdline_action.cc:550
 #, c-format
 msgid ""
 "Couldn't find package \"%s\", and more than 40\n"
 "packages contain \"%s\" in their name.\n"
 msgstr "無法找到套件 \"%s\"，而且超� 40 �套件�稱中包� \"%s\"。\n"
 
-#: src/cmdline/cmdline_action.cc:560
+#: src/cmdline/cmdline_action.cc:555
 #, c-format
 msgid ""
 "Couldn't find package \"%s\".  However, the following\n"
@@ -752,12 +738,12 @@ msgstr ""
 "無法找到套件 \"%s\"。 然而，以下\n"
 "套件�稱中包� \"%s\":\n"
 
-#: src/cmdline/cmdline_action.cc:582
+#: src/cmdline/cmdline_action.cc:579
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr "無法找到任何套件的�稱或敘述�有 \"%s\"\n"
 
-#: src/cmdline/cmdline_action.cc:584
+#: src/cmdline/cmdline_action.cc:582
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
@@ -775,7 +761,7 @@ msgstr ""
 "無法找到任何套件�� \"%s\"。 然而，以下的套件敘述中包�\n"
 "\"%s\":\n"
 
-#: src/cmdline/cmdline_action.cc:729
+#: src/cmdline/cmdline_action.cc:705
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr "錯誤的動作指令� '%c'\n"
@@ -798,98 +784,83 @@ msgstr "錯誤 "
 msgid "Changelog download failed: %s"
 msgstr "%s 的變更日誌"
 
-#: src/cmdline/cmdline_changelog.cc:283
+#: src/cmdline/cmdline_changelog.cc:282
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr "無法執行 sensible-pager, 這是正常的 Debian 系統嗎？"
 
 #: src/cmdline/cmdline_changelog.cc:341
 #, c-format
-msgid "%s is not an official Debian package, cannot display its changelog."
-msgstr "%s �是官方 Debian 套件，無法顯示更改紀錄"
-
-#: src/cmdline/cmdline_changelog.cc:425
-#, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "無法找到 %s 的更改紀錄"
 
-#: src/cmdline/cmdline_changelog.cc:429
+#: src/cmdline/cmdline_changelog.cc:345
 #, fuzzy, c-format
 msgid "Couldn't run pager %s"
 msgstr "無法找到 %s 的更改紀錄"
 
 #: src/cmdline/cmdline_clean.cc:60
-#, c-format
-msgid "E: The clean command takes no arguments\n"
-msgstr "E: clean 指令�接�任何�數\n"
+msgid "The clean command takes no arguments"
+msgstr "clean 指令�接�任何�數"
 
 #: src/cmdline/cmdline_clean.cc:66
 #, c-format
 msgid "Del %s* %spartial/*\n"
 msgstr "刪除 %s* %spartial/*\n"
 
-#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:146
-#: src/ui.cc:1787 src/ui.cc:1875
+#: src/cmdline/cmdline_clean.cc:76 src/cmdline/cmdline_clean.cc:139
+#: src/ui.cc:1789 src/ui.cc:1877
 #, fuzzy
 msgid "Unable to lock the download directory"
 msgstr "無法查閱您的主目錄，儲存到 /tmp/function_pkgs�"
 
-#: src/cmdline/cmdline_clean.cc:106
+#: src/cmdline/cmdline_clean.cc:99
 #, c-format
 msgid "Del %s %s [%sB]\n"
 msgstr "刪除 %s %s [%sB]\n"
 
-#: src/cmdline/cmdline_clean.cc:134
-#, c-format
-msgid "E: The autoclean command takes no arguments\n"
-msgstr "E: autoclean 指令�接�任何�數\n"
+#: src/cmdline/cmdline_clean.cc:127
+msgid "The autoclean command takes no arguments"
+msgstr "autoclean 指令�接�任何�數"
 
-#: src/cmdline/cmdline_clean.cc:172
+#: src/cmdline/cmdline_clean.cc:159
 #, c-format
 msgid "Would free %sB of disk space\n"
 msgstr "將釋放 %sB �碟空間\n"
 
-#: src/cmdline/cmdline_clean.cc:175
+#: src/cmdline/cmdline_clean.cc:162
 #, c-format
 msgid "Freed %sB of disk space\n"
 msgstr "已釋放 %sB �碟空間\n"
 
-#: src/cmdline/cmdline_do_action.cc:159
+#: src/cmdline/cmdline_do_action.cc:160
 #, c-format
 msgid "Invalid operation %s"
 msgstr "無效的�作“%s�"
 
-#: src/cmdline/cmdline_do_action.cc:233
+#: src/cmdline/cmdline_do_action.cc:227
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr "在�數“keep-all�之後有�料之外的模�"
 
-#: src/cmdline/cmdline_do_action.cc:345
-#, c-format
-msgid ""
-"Unable to safely resolve dependencies, try running with --full-resolver.\n"
-msgstr "無法解決相�關係。試著執行時加入--full-resolver�數\n"
+#: src/cmdline/cmdline_do_action.cc:342
+msgid "Unable to safely resolve dependencies, try running with --full-resolver"
+msgstr "無法解決相�關係。試著執行時加入--full-resolver�數"
 
-#: src/cmdline/cmdline_do_action.cc:385 src/cmdline/cmdline_simulate.cc:60
-#: src/main.cc:1223
+#: src/cmdline/cmdline_do_action.cc:380 src/cmdline/cmdline_simulate.cc:60
+#: src/main.cc:992
 #, c-format
 msgid "Abort.\n"
 msgstr "放棄。\n"
 
 #: src/cmdline/cmdline_download.cc:45
-#, c-format
-msgid "download: you must specify at least one package to download\n"
-msgstr "downloa: 你必須至少指定一個下載套件\n"
+msgid "download: you must specify at least one package to download"
+msgstr "downloa: 你必須至少指定一個下載套件"
 
-#: src/cmdline/cmdline_download.cc:63
-#: src/generic/apt/download_install_manager.cc:83
+#: src/cmdline/cmdline_download.cc:60
+#: src/generic/apt/download_install_manager.cc:87
 msgid "Couldn't read source list"
 msgstr "無法讀��列表檔案"
 
-#: src/cmdline/cmdline_download.cc:97
-#, c-format
-msgid "Can't find a package named \"%s\""
-msgstr "無法找到任何套件的�稱 \"%s\""
-
-#: src/cmdline/cmdline_download.cc:141
+#: src/cmdline/cmdline_download.cc:94
 #, c-format
 msgid ""
 "No downloadable files for %s version %s; perhaps it is a local or obsolete "
@@ -926,32 +897,21 @@ msgid "[Working]"
 msgstr "[正在工作]"
 
 #: src/cmdline/cmdline_extract_cache_subset.cc:57
-#, c-format
 msgid ""
-"extract-cache-entries: at least one argument is required (the directory\n"
-"to which to write files).\n"
-msgstr ""
-"extract-cache-entries：至少需�一個�數(該目錄\n"
-"為寫入檔案用)。\n"
+"extract-cache-entries: at least one argument is required (the directory to "
+"which to write files)"
+msgstr "extract-cache-entries：至少需�一個�數(該目錄為寫入檔案用)"
 
-#: src/cmdline/cmdline_extract_cache_subset.cc:93
-#: src/cmdline/cmdline_resolver.cc:361 src/cmdline/cmdline_user_tag.cc:131
-#: src/cmdline/cmdline_versions.cc:295
-#, c-format
-msgid "No such package \"%s\""
-msgstr "無此套件“%s�"
-
-#: src/cmdline/cmdline_extract_cache_subset.cc:133
+#: src/cmdline/cmdline_extract_cache_subset.cc:90
 #, c-format
 msgid "No packages were selected by the given search pattern; nothing to do.\n"
 msgstr "�給定的�尋�則找�到套件；無事�作。\n"
 
 #: src/cmdline/cmdline_forget_new.cc:56
-#, c-format
-msgid "E: The forget-new command takes no arguments\n"
-msgstr "E: forget-new 指令�接�任何�數\n"
+msgid "The forget-new command takes no arguments"
+msgstr "forget-new 指令�接�任何�數"
 
-#: src/cmdline/cmdline_forget_new.cc:83
+#: src/cmdline/cmdline_forget_new.cc:77
 #, c-format
 msgid "Would forget what packages are new\n"
 msgstr "忽略哪些套件是“新�的\n"
@@ -1059,17 +1019,17 @@ msgstr "以下套件將會�級:"
 msgid "The following partially installed packages will be configured:"
 msgstr "以下部份套件將會被設定："
 
-#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1574
+#: src/cmdline/cmdline_prompt.cc:459 src/ui.cc:1576
 #, c-format
 msgid "The following ESSENTIAL packages will be REMOVED!\n"
 msgstr "以下基本套件將會移除�\n"
 
-#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1589
+#: src/cmdline/cmdline_prompt.cc:468 src/ui.cc:1591
 #, c-format
 msgid "The following ESSENTIAL packages will be BROKEN by this action:\n"
 msgstr "以下基本套件將會因此動作而毀斷�\n"
 
-#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1602
+#: src/cmdline/cmdline_prompt.cc:478 src/ui.cc:1604
 #, c-format
 msgid ""
 "WARNING: Performing this action will probably cause your system to break!\n"
@@ -1078,16 +1038,16 @@ msgstr ""
 "警告: 執行以下動作�能會造�您的系統毀壞�\n"
 "             ���續進行，無�您很清楚自己在�什麼�\n"
 
-#: src/cmdline/cmdline_prompt.cc:480
+#: src/cmdline/cmdline_prompt.cc:483
 msgid "I am aware that this is a very bad idea"
 msgstr "I am aware that this is a very bad idea"
 
-#: src/cmdline/cmdline_prompt.cc:484 src/ui.cc:1603
+#: src/cmdline/cmdline_prompt.cc:487 src/ui.cc:1605
 #, c-format
 msgid "To continue, type the phrase \"%s\":\n"
 msgstr "�繼續，請輸入以下�明  \"%s\":\n"
 
-#: src/cmdline/cmdline_prompt.cc:526
+#: src/cmdline/cmdline_prompt.cc:529
 #, c-format
 msgid ""
 "WARNING: untrusted versions of the following packages will be installed!\n"
@@ -1103,7 +1063,7 @@ msgstr ""
 "�有在您確定您真的�這麼�時，您��以進行安�作業。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:538
+#: src/cmdline/cmdline_prompt.cc:541
 #, c-format
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
@@ -1112,7 +1072,7 @@ msgstr ""
 "*** 警告 ***  忽略這些信任�背，因為\n"
 "                 %s::CmdLine::Ignore-Trust-Violations 的值為“真��\n"
 
-#: src/cmdline/cmdline_prompt.cc:547
+#: src/cmdline/cmdline_prompt.cc:550
 msgid ""
 "*** WARNING ***   Ignoring these trust violations because\n"
 "                  Apt::Get::AllowUnauthenticated is 'true'!\n"
@@ -1125,7 +1085,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:558
+#: src/cmdline/cmdline_prompt.cc:561
 msgid "Go ahead and ignore the warning|Yes"
 msgstr ""
 
@@ -1134,199 +1094,199 @@ 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:564
+#: src/cmdline/cmdline_prompt.cc:567
 msgid "Abort instead of overriding the warning|No"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:575
+#: src/cmdline/cmdline_prompt.cc:578
 #, c-format
 msgid "Do you want to ignore this warning and proceed anyway?\n"
 msgstr "您是��忽略這個警告，�管如何繼續進行？\n"
 
-#: src/cmdline/cmdline_prompt.cc:576
+#: src/cmdline/cmdline_prompt.cc:579
 #, c-format
 msgid "To continue, enter \"%s\"; to abort, enter \"%s\": "
 msgstr "�繼續，請輸入 \"%s\"；若�放棄，請輸入 \"%s\"："
 
-#: src/cmdline/cmdline_prompt.cc:593
+#: src/cmdline/cmdline_prompt.cc:596
 #, c-format
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr "輸入的文字無法辨識。 請輸入 \"%s\" 或 \"%s\"。\n"
 
-#: src/cmdline/cmdline_prompt.cc:707
+#: src/cmdline/cmdline_prompt.cc:710
 #, c-format
 msgid "The following packages are RECOMMENDED but will NOT be installed:\n"
 msgstr "以下套件�到推薦但是將�會安�:\n"
 
-#: src/cmdline/cmdline_prompt.cc:713
+#: src/cmdline/cmdline_prompt.cc:716
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr "以下套件�到建議但是將�會安�:\n"
 
-#: src/cmdline/cmdline_prompt.cc:719
+#: src/cmdline/cmdline_prompt.cc:722
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr "沒有套件將會被安���級或移除。\n"
 
-#: src/cmdline/cmdline_prompt.cc:721
+#: src/cmdline/cmdline_prompt.cc:724
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr "%lu 個套件�級, %lu 個新安�, "
 
-#: src/cmdline/cmdline_prompt.cc:725
+#: src/cmdline/cmdline_prompt.cc:728
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu 個�新安�, "
 
-#: src/cmdline/cmdline_prompt.cc:727
+#: src/cmdline/cmdline_prompt.cc:730
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu 個�級, "
 
-#: src/cmdline/cmdline_prompt.cc:729
+#: src/cmdline/cmdline_prompt.cc:732
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu 個將移除且 %lu 個�會�級.\n"
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:739
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr "需�下載 %sB/%sB 的歸檔檔案. "
 
-#: src/cmdline/cmdline_prompt.cc:739
+#: src/cmdline/cmdline_prompt.cc:742
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr "需�下載 %sB 的歸檔檔案. "
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:749
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr "解�後將用去 %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:749
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr "解�後將釋出 %sB.\n"
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:774
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr "無顯示套件 -- 請在 'i' 之後輸入套件�稱。\n"
 
-#: src/cmdline/cmdline_prompt.cc:777 src/cmdline/cmdline_prompt.cc:792
+#: src/cmdline/cmdline_prompt.cc:780 src/cmdline/cmdline_prompt.cc:795
 #: src/pkg_item.cc:410 src/ui.cc:1219
 msgid "Press Return to continue."
 msgstr "按 Return 繼續。"
 
-#: src/cmdline/cmdline_prompt.cc:788
+#: src/cmdline/cmdline_prompt.cc:791
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr "未找到套件 -- 請在 'c' 之後輸入套件�稱。\n"
 
-#: src/cmdline/cmdline_prompt.cc:803
+#: src/cmdline/cmdline_prompt.cc:806
 #, c-format
 msgid ""
 "No packages found -- enter zero or more roots of the search followed by the "
 "package to justify.\n"
 msgstr "未發�套件 -- 請輸入0個或多個�尋內容�接著輸入��尋的套件�稱。\n"
 
-#: src/cmdline/cmdline_prompt.cc:836
+#: src/cmdline/cmdline_prompt.cc:839
 #, c-format
 msgid "y: %F"
 msgstr "y: %F"
 
-#: src/cmdline/cmdline_prompt.cc:838
+#: src/cmdline/cmdline_prompt.cc:841
 msgid "continue with the installation"
 msgstr "繼續安�"
 
-#: src/cmdline/cmdline_prompt.cc:840
+#: src/cmdline/cmdline_prompt.cc:843
 #, c-format
 msgid "n: %F"
 msgstr "n: %F"
 
-#: src/cmdline/cmdline_prompt.cc:842
+#: src/cmdline/cmdline_prompt.cc:845
 msgid "abort and quit"
 msgstr "放棄並退出"
 
-#: src/cmdline/cmdline_prompt.cc:844
+#: src/cmdline/cmdline_prompt.cc:847
 #, c-format
 msgid "i: %F"
 msgstr "i: %F"
 
-#: src/cmdline/cmdline_prompt.cc:846
+#: src/cmdline/cmdline_prompt.cc:849
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr "顯示一個或者多個套件的訊�；套件的�字將在字元“i�之後。"
 
-#: src/cmdline/cmdline_prompt.cc:848
+#: src/cmdline/cmdline_prompt.cc:851
 #, c-format
 msgid "c: %F"
 msgstr "c: %F"
 
-#: src/cmdline/cmdline_prompt.cc:850
+#: src/cmdline/cmdline_prompt.cc:853
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
 msgstr "顯示一個或者多個套件的變更記錄；套件的�字將在字元“c�之後。"
 
-#: src/cmdline/cmdline_prompt.cc:852
+#: src/cmdline/cmdline_prompt.cc:855
 #, c-format
 msgid "d: %F"
 msgstr "d: %F"
 
-#: src/cmdline/cmdline_prompt.cc:854
+#: src/cmdline/cmdline_prompt.cc:857
 msgid "toggle the display of dependency information"
 msgstr "切�是�顯示相�賴關系訊�"
 
-#: src/cmdline/cmdline_prompt.cc:856
+#: src/cmdline/cmdline_prompt.cc:859
 #, c-format
 msgid "s: %F"
 msgstr "s: %F"
 
-#: src/cmdline/cmdline_prompt.cc:858
+#: src/cmdline/cmdline_prompt.cc:861
 msgid "toggle the display of changes in package sizes"
 msgstr "切�是�顯示套件的大�"
 
-#: src/cmdline/cmdline_prompt.cc:860
+#: src/cmdline/cmdline_prompt.cc:863
 #, c-format
 msgid "v: %F"
 msgstr "v: %F"
 
-#: src/cmdline/cmdline_prompt.cc:862
+#: src/cmdline/cmdline_prompt.cc:865
 msgid "toggle the display of version numbers"
 msgstr "切�是�顯示版本號"
 
-#: src/cmdline/cmdline_prompt.cc:864
+#: src/cmdline/cmdline_prompt.cc:867
 #, c-format
 msgid "w: %F"
 msgstr "w: %F"
 
-#: src/cmdline/cmdline_prompt.cc:866
+#: src/cmdline/cmdline_prompt.cc:869
 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:869
+#: src/cmdline/cmdline_prompt.cc:872
 #, c-format
 msgid "r: %F"
 msgstr "r: %F"
 
-#: src/cmdline/cmdline_prompt.cc:871
+#: src/cmdline/cmdline_prompt.cc:874
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr "執行自動相�解決器來修正已�毀的相�性。"
 
-#: src/cmdline/cmdline_prompt.cc:873
+#: src/cmdline/cmdline_prompt.cc:876
 #, c-format
 msgid "e: %F"
 msgstr "e: %F"
 
-#: src/cmdline/cmdline_prompt.cc:875
+#: src/cmdline/cmdline_prompt.cc:878
 msgid "enter the full visual interface"
 msgstr "進入全�視覺化介�"
 
-#: src/cmdline/cmdline_prompt.cc:878
+#: src/cmdline/cmdline_prompt.cc:881
 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 "
@@ -1336,45 +1296,45 @@ msgstr ""
 "您也�以�將�實施的動作進行修改。方法是，輸入一個動作字元後輸入一個或者多個"
 "套件的�稱(或者模�)。該動作將被實施到您所�擇的全部套件。下列動作�供�擇："
 
-#: src/cmdline/cmdline_prompt.cc:885 src/cmdline/cmdline_resolver.cc:267
+#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:267
 msgid "'+' to install packages"
 msgstr "按'+'�來安�套件"
 
-#: src/cmdline/cmdline_prompt.cc:888 src/cmdline/cmdline_resolver.cc:269
+#: src/cmdline/cmdline_prompt.cc:891 src/cmdline/cmdline_resolver.cc:269
 msgid ""
 "'+M' to install packages and immediately flag them as automatically installed"
 msgstr "按'+M'安�套件並且立�將它們標記為已安�狀態"
 
-#: src/cmdline/cmdline_prompt.cc:890 src/cmdline/cmdline_resolver.cc:271
+#: src/cmdline/cmdline_prompt.cc:893 src/cmdline/cmdline_resolver.cc:271
 msgid "'-' to remove packages"
 msgstr "按'-'移除套件"
 
-#: src/cmdline/cmdline_prompt.cc:892 src/cmdline/cmdline_resolver.cc:273
+#: src/cmdline/cmdline_prompt.cc:895 src/cmdline/cmdline_resolver.cc:273
 msgid "'_' to purge packages"
 msgstr "按'_'清除套件"
 
-#: src/cmdline/cmdline_prompt.cc:894 src/cmdline/cmdline_resolver.cc:275
+#: src/cmdline/cmdline_prompt.cc:897 src/cmdline/cmdline_resolver.cc:275
 msgid "'=' to place packages on hold"
 msgstr "“=�將套件置於��狀態"
 
-#: src/cmdline/cmdline_prompt.cc:896 src/cmdline/cmdline_resolver.cc:277
+#: src/cmdline/cmdline_prompt.cc:899 src/cmdline/cmdline_resolver.cc:277
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr "按':'將維�套件當�狀態但是並�將其置於��狀態"
 
-#: src/cmdline/cmdline_prompt.cc:898 src/cmdline/cmdline_resolver.cc:279
+#: src/cmdline/cmdline_prompt.cc:901 src/cmdline/cmdline_resolver.cc:279
 msgid "'&M' to mark packages as automatically installed"
 msgstr "按'&M'將套件標記為自動安�"
 
-#: src/cmdline/cmdline_prompt.cc:900 src/cmdline/cmdline_resolver.cc:281
+#: src/cmdline/cmdline_prompt.cc:903 src/cmdline/cmdline_resolver.cc:281
 msgid "'&m' to mark packages as manually installed"
 msgstr "按'm'將套件標記為手動安�"
 
-#: src/cmdline/cmdline_prompt.cc:902
+#: src/cmdline/cmdline_prompt.cc:905
 msgid "'&BD' to install the build-dependencies of a package."
 msgstr "'&BD' 安�套件的編譯相�套件。"
 
-#: src/cmdline/cmdline_prompt.cc:905
+#: src/cmdline/cmdline_prompt.cc:908
 msgid ""
 "In the list of actions to be performed, some packages will be followed by "
 "one or more characters enclosed in braces; for instance: \"aptitude{u}\".  "
@@ -1382,29 +1342,29 @@ msgid ""
 "can include any combination of the following:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:909
+#: src/cmdline/cmdline_prompt.cc:912
 #, fuzzy
 msgid "'a': the package was automatically installed or removed."
 msgstr "按'&M'將套件標記為自動安�"
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:914
 msgid ""
 "'b': some of the package's dependencies are violated by the proposed changes."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:913
+#: src/cmdline/cmdline_prompt.cc:916
 msgid "'p': the package will be purged in addition to being removed."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:915
+#: src/cmdline/cmdline_prompt.cc:918
 msgid "'u': the package is being removed because it is unused."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:920
+#: src/cmdline/cmdline_prompt.cc:923
 msgid "Commands:"
 msgstr "命令："
 
-#: src/cmdline/cmdline_prompt.cc:1036
+#: src/cmdline/cmdline_prompt.cc:1039
 msgid ""
 "aptitude failed to find a solution to these dependencies.  You can solve "
 "them yourself by hand or type 'n' to quit."
@@ -1412,19 +1372,19 @@ msgstr ""
 "aptitude 無法找到解決這些相��題的方法。  你�手動解決這些�題或輸入'n'來離"
 "開。"
 
-#: src/cmdline/cmdline_prompt.cc:1055
+#: src/cmdline/cmdline_prompt.cc:1058
 msgid "Do you want to continue? [Y/n/?] "
 msgstr "您想繼續嗎? [Y/n/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1056
+#: src/cmdline/cmdline_prompt.cc:1059
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr "�手動解決這些相�性嗎？ [N/+/-/_/:/?] "
 
-#: src/cmdline/cmdline_prompt.cc:1074
+#: src/cmdline/cmdline_prompt.cc:1077
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr "錯誤回應。請輸入一個正確的指令或 '?' 以�得�助。\n"
 
-#: src/cmdline/cmdline_prompt.cc:1080
+#: src/cmdline/cmdline_prompt.cc:1083
 msgid ""
 "Enter a package management command (such as '+ package' to install a "
 "package), 'R' to attempt automatic dependency resolution or 'N' to abort."
@@ -1432,7 +1392,7 @@ msgstr ""
 "輸入一個套件管�指令(如'+package'來安�套件)，'R'是嘗試自動解決相��題"
 "或'N'是放棄。"
 
-#: src/cmdline/cmdline_prompt.cc:1112
+#: src/cmdline/cmdline_prompt.cc:1115
 #, c-format
 msgid ""
 "\n"
@@ -1443,7 +1403,7 @@ msgstr ""
 "相�性資訊將會顯示。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1114
+#: src/cmdline/cmdline_prompt.cc:1117
 #, c-format
 msgid ""
 "\n"
@@ -1454,7 +1414,7 @@ msgstr ""
 "相�性資訊將�會顯示。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1120
+#: src/cmdline/cmdline_prompt.cc:1123
 #, c-format
 msgid ""
 "\n"
@@ -1465,7 +1425,7 @@ msgstr ""
 "版本將會顯示。\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1122
+#: src/cmdline/cmdline_prompt.cc:1125
 #, c-format
 msgid ""
 "\n"
@@ -1476,7 +1436,7 @@ msgstr ""
 "版本將�會顯示\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1127
+#: src/cmdline/cmdline_prompt.cc:1130
 #, c-format
 msgid ""
 "\n"
@@ -1487,7 +1447,7 @@ msgstr ""
 "變動大�將會顯示\n"
 "\n"
 
-#: src/cmdline/cmdline_prompt.cc:1129
+#: src/cmdline/cmdline_prompt.cc:1132
 #, c-format
 msgid ""
 "\n"
@@ -1616,6 +1576,11 @@ msgstr "在“%c�後需�至少一個套件/版本�"
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr "期許“%2$s�之後的一個�期版本或“%1$s�"
 
+#: src/cmdline/cmdline_resolver.cc:361
+#, c-format
+msgid "No such package \"%s\""
+msgstr "無此套件“%s�"
+
 #: src/cmdline/cmdline_resolver.cc:377
 #, c-format
 msgid "%s has no version named \"%s\""
@@ -1764,7 +1729,7 @@ msgstr ""
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr "我想�自動解決相�功能，但沒有相�解決器被建立。"
 
-#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1180
+#: src/cmdline/cmdline_resolver.cc:837 src/cmdline/cmdline_resolver.cc:1181
 #: src/gtk/resolver.cc:2058 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 msgid "Resolving dependencies..."
@@ -1792,7 +1757,7 @@ msgstr "放棄自動相�解決，返回手動解法。"
 msgid "The following commands are available:"
 msgstr "下列命令��："
 
-#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2316
+#: src/cmdline/cmdline_resolver.cc:999 src/ui.cc:2318
 msgid "File to write resolver state to: "
 msgstr "將相�關係解決狀態寫入檔案："
 
@@ -1822,7 +1787,7 @@ msgid ""
 "           searching, but some solutions will be unreachable."
 msgstr "*** 錯誤：�尋�到嚴��外。您能繼續�尋，但無法�得解決的方法。"
 
-#: src/cmdline/cmdline_resolver.cc:1191
+#: src/cmdline/cmdline_resolver.cc:1192
 #, c-format
 msgid ""
 "Unable to resolve dependencies for the upgrade because the resolver timed "
@@ -1831,25 +1796,24 @@ msgid ""
 "  Aptitude::ProblemResolver::StepLimit (currently %d)."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1201
+#: src/cmdline/cmdline_resolver.cc:1202
 #, fuzzy
 msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "未能解決�級時產生的相��題。(找�到解法)。"
 
-#: src/cmdline/cmdline_resolver.cc:1207
+#: src/cmdline/cmdline_resolver.cc:1208
 #, fuzzy, c-format
 msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "�級(%s)時無法解決相��題。"
 
-#: src/cmdline/cmdline_search.cc:198 src/cmdline/cmdline_versions.cc:567
+#: src/cmdline/cmdline_search.cc:189 src/cmdline/cmdline_versions.cc:564
 #, c-format
-msgid "iconv of %s failed.\n"
-msgstr "用 iconv 轉� %s 失敗。\n"
+msgid "iconv of %s failed"
+msgstr "用 iconv 轉� %s 失敗"
 
-#: src/cmdline/cmdline_search.cc:215
-#, c-format
-msgid "search: You must provide at least one search term\n"
-msgstr "�尋: 您至少��供一個�尋字串\n"
+#: src/cmdline/cmdline_search.cc:203
+msgid "search: You must provide at least one search term"
+msgstr "�尋: 您至少��供一個�尋字串"
 
 #: src/cmdline/cmdline_show_broken.cc:81
 #, c-format
@@ -1892,7 +1856,7 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "以下套件�有相�性:\n"
 
 #: src/cmdline/cmdline_show.cc:198 src/cmdline/cmdline_show.cc:448
-#: src/cmdline/cmdline_versions.cc:208 src/gtk/resolver.cc:1192
+#: src/cmdline/cmdline_versions.cc:209 src/gtk/resolver.cc:1192
 #: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
@@ -2115,7 +2079,7 @@ msgid "Enhances"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:471 src/cmdline/cmdline_why.cc:230
-#: src/cmdline/cmdline_why.cc:1632 src/gtk/dependency_chains_tab.cc:205
+#: src/cmdline/cmdline_why.cc:1622 src/gtk/dependency_chains_tab.cc:205
 msgid "Provides"
 msgstr "�供"
 
@@ -2129,15 +2093,9 @@ msgstr "�述: "
 msgid "Homepage: "
 msgstr "官網： "
 
-#: src/cmdline/cmdline_show.cc:582
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "無法定�套件 %s"
-
-#: src/cmdline/cmdline_show.cc:603
-#, c-format
-msgid "Unable to parse pattern %s"
-msgstr "無法分�模� %s"
+#: src/cmdline/cmdline_show.cc:610 src/cmdline/cmdline_user_tag.cc:126
+msgid "No packages found"
+msgstr "未找到套件"
 
 #: src/cmdline/cmdline_simulate.cc:66
 #, c-format
@@ -2148,14 +2106,13 @@ msgstr "將下載/安�/移除套件。\n"
 msgid "Internal Error, Ordering didn't finish"
 msgstr "內部錯誤, 排�無法完�"
 
-#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1711 src/ui.cc:1880
+#: src/cmdline/cmdline_update.cc:44 src/ui.cc:1713 src/ui.cc:1882
 msgid "Deleting obsolete downloaded files"
 msgstr "刪除�期的下載檔案"
 
 #: src/cmdline/cmdline_update.cc:55
-#, c-format
-msgid "E: The update command takes no arguments\n"
-msgstr "E: update 指令�接�任何�數\n"
+msgid "The update command takes no arguments"
+msgstr "update 指令�接�任何�數"
 
 #: src/cmdline/cmdline_user_tag.cc:65
 #, c-format
@@ -2172,127 +2129,149 @@ msgstr "移除\"$2%s\"套件的使用者標誌\"$1%s\"。\n"
 msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr "%s 太少�數；至少�一個標誌和套件�稱。\n"
 
-#: src/cmdline/cmdline_util.cc:167
-#, c-format
-msgid "No candidate version found for %s\n"
-msgstr "未找到 %s 的候�版本\n"
-
-#: src/cmdline/cmdline_util.cc:169
+#: src/cmdline/cmdline_util.cc:172
 #, c-format
-msgid "No current or candidate version found for %s\n"
-msgstr "未發� %s 的已安�或候�版本\n"
+msgid "No candidate version found for %s"
+msgstr "未找到 %s 的候�版本"
 
-#: src/cmdline/cmdline_util.cc:193
+#: src/cmdline/cmdline_util.cc:176
 #, c-format
-msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
-msgstr "無法找到 \"%s\" 套件的歸檔 \"%s\"\n"
+msgid "No current or candidate version found for %s"
+msgstr "未發� %s 的已安�或候�版本"
 
-#: src/cmdline/cmdline_util.cc:203
+#: src/cmdline/cmdline_util.cc:202
 #, c-format
-msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
-msgstr "無法找到版本為 \"%s\" 的 \"%s\" 套件\n"
+msgid "Unable to find an archive \"%s\" for the package \"%s\""
+msgstr "無法找到 \"%s\" 套件的歸檔 \"%s\""
 
-#: src/cmdline/cmdline_util.cc:209
+#: src/cmdline/cmdline_util.cc:213
 #, c-format
-msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
-msgstr "內部錯誤: 傳給 cmdline_find_ver 的數值 %i 錯誤!\n"
+msgid "Unable to find a version \"%s\" for the package \"%s\""
+msgstr "無法找到版本為 \"%s\" 的 \"%s\" 套件"
 
-#: src/cmdline/cmdline_util.cc:239
+#: src/cmdline/cmdline_util.cc:219
 #, c-format
-msgid "You cannot specify both an archive and a version for a package\n"
-msgstr "你無法�時指定一個套件的歸檔類別與版本\n"
+msgid "Internal error: invalid value %i passed to cmdline_find_ver!"
+msgstr "內部錯誤: 傳給 cmdline_find_ver 的數值 %i 錯誤!"
 
-#: src/cmdline/cmdline_util.cc:273
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "無法找到 %s 的更改紀錄"
+#: src/cmdline/cmdline_util.cc:248
+msgid "You cannot specify both an archive and a version for a package"
+msgstr "你無法�時指定一個套件的歸檔類別與版本"
 
-#: src/cmdline/cmdline_util.cc:361
+#: src/cmdline/cmdline_util.cc:345
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] "%d �壞 [%+d]"
 
-#: src/cmdline/cmdline_util.cc:375
+#: src/cmdline/cmdline_util.cc:359
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] "%d æ›´æ–° [%+d]"
 
-#: src/cmdline/cmdline_util.cc:389
+#: src/cmdline/cmdline_util.cc:373
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] "%d 新加入[%+d]"
 
-#: src/cmdline/cmdline_util.cc:400
+#: src/cmdline/cmdline_util.cc:384
 #, c-format
 msgid "Current status: %F."
 msgstr "目�狀態： %F。"
 
-#: src/cmdline/cmdline_util.cc:411
+#: src/cmdline/cmdline_util.cc:395
 #, c-format
 msgid "There is %d newly obsolete package."
 msgid_plural "There are %d newly obsolete packages."
 msgstr[0] "有 %d 個新�棄套件。"
 
-#: src/cmdline/cmdline_util.cc:423
+#: src/cmdline/cmdline_util.cc:407
 #, c-format
 msgid "There is %d newly obsolete package: "
 msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] "共有 %d 個新被癈棄�用的套件："
 
-#: src/cmdline/cmdline_versions.cc:125
+#: src/cmdline/cmdline_util.cc:752
+#, c-format
+msgid "No comma following tag name \"%s\""
+msgstr "標誌“%s�後沒有逗點"
+
+#: src/cmdline/cmdline_util.cc:864 src/cmdline/cmdline_util.cc:915
+#: src/cmdline/cmdline_versions.cc:296 src/cmdline/cmdline_versions.cc:618
+#: src/cmdline/cmdline_why.cc:1300 src/cmdline/cmdline_why.cc:1385
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "無法定�套件 %s"
+
+#: src/cmdline/cmdline_util.cc:937
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "無法找到 %s 的更改紀錄"
+
+#: src/cmdline/cmdline_util.cc:939
+#, c-format
+msgid "Note: selecting the task \"%s: %s\" for installation\n"
+msgstr "附註: �擇安�作業 \"%s: %s\"\n"
+
+#: src/cmdline/cmdline_util.cc:966
+#, fuzzy, c-format
+#| msgid "Couldn't find a changelog for %s"
+msgid "Couldn't find any package for pattern '%s'"
+msgstr "無法找到 %s 的更改紀錄"
+
+#: src/cmdline/cmdline_versions.cc:126
 #, fuzzy, c-format
 msgid "Package %s:"
 msgstr "套件"
 
-#: src/cmdline/cmdline_versions.cc:152 src/cmdline/cmdline_versions.cc:191
+#: src/cmdline/cmdline_versions.cc:153 src/cmdline/cmdline_versions.cc:192
 #, fuzzy, c-format
 msgid "Source package %s:"
 msgstr "�碼套件："
 
-#: src/cmdline/cmdline_versions.cc:213
+#: src/cmdline/cmdline_versions.cc:214
 #, fuzzy, c-format
 msgid "Archive %s:"
 msgstr "歸檔"
 
-#: src/cmdline/cmdline_versions.cc:502
+#: src/cmdline/cmdline_versions.cc:503
 msgid "--group-by|archive"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:506
+#: src/cmdline/cmdline_versions.cc:507
 msgid "--group-by|auto"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:510
+#: src/cmdline/cmdline_versions.cc:511
 msgid "--group-by|none"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:514
+#: src/cmdline/cmdline_versions.cc:515
 msgid "--group-by|package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:518
+#: src/cmdline/cmdline_versions.cc:519
 msgid "--group-by|source-package"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:522
+#: src/cmdline/cmdline_versions.cc:523
 msgid "--group-by|source-version"
 msgstr ""
 
 #. ForTranslators: --group-by is the argument name and shouldn't
 #. be translated.
-#: src/cmdline/cmdline_versions.cc:528
+#: src/cmdline/cmdline_versions.cc:529
 #, c-format
 msgid ""
 "Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
 "\", or \"source-package\")"
 msgstr ""
 
-#: src/cmdline/cmdline_versions.cc:584
-#, fuzzy, c-format
-msgid "versions: You must provide at least one package selector\n"
+#: src/cmdline/cmdline_versions.cc:578
+#, fuzzy
+msgid "versions: You must provide at least one package selector"
 msgstr "�尋: 您至少��供一個�尋字串\n"
 
 #: src/cmdline/cmdline_why.cc:290
@@ -2315,7 +2294,7 @@ msgstr "目�"
 msgid "Candidate"
 msgstr "候�版本"
 
-#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1417
+#: src/cmdline/cmdline_why.cc:321 src/gtk/gui.cc:91 src/gtk/gui.cc:1409
 msgid "Install"
 msgstr "安�"
 
@@ -2417,20 +2396,18 @@ msgstr "未能找到安�%s套件的�由。\n"
 msgid "Packages requiring %s:"
 msgstr "�賴於 %s 的套件"
 
-#: src/cmdline/cmdline_why.cc:1299 src/cmdline/cmdline_why.cc:1327
-#: src/cmdline/cmdline_why.cc:1391
+#: src/cmdline/cmdline_why.cc:1323
 #, c-format
 msgid "No package named \"%s\" exists."
 msgstr "套件“%s��存在。"
 
-#: src/cmdline/cmdline_why.cc:1331
+#: src/cmdline/cmdline_why.cc:1327
 msgid "Unable to parse some match patterns."
 msgstr "無法解�匹�的模�。"
 
-#: src/cmdline/cmdline_why.cc:1366
+#: src/cmdline/cmdline_why.cc:1362
 #, fuzzy, c-format
-msgid ""
-"%s: this command requires at least one argument (the package to query).\n"
+msgid "%s: this command requires at least one argument (the package to query)"
 msgstr "%s：該指令至少需�一個�數(被查詢的套件�)。"
 
 #: src/cmdline/cmdline_why.h:212
@@ -2457,11 +2434,11 @@ msgstr "未滿足的"
 msgid "UNAVAILABLE"
 msgstr "��用"
 
-#: src/desc_render.cc:134 src/gtk/aptitude.glade:1051
+#: src/desc_render.cc:123 src/gtk/aptitude.glade:1051
 msgid "Tags"
 msgstr "標簽"
 
-#: src/desc_render.cc:149
+#: src/desc_render.cc:138
 msgid "User Tags"
 msgstr "使用者自訂標誌"
 
@@ -2660,32 +2637,32 @@ msgstr ""
 "無法鎖定快�檔案。這表示有其它dpkg或apt工具正在安�套件。目�以唯讀方�打開；"
 "您�套件狀態所作的任何改變都�會被儲存�"
 
-#: src/generic/apt/apt.cc:1272
+#: src/generic/apt/apt.cc:1268
 msgid "foreign"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1274
+#: src/generic/apt/apt.cc:1270
 msgid "same"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1277
+#: src/generic/apt/apt.cc:1273
 #, fuzzy
 msgid "allowed"
 msgstr "�許的�項"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "main"
 msgstr "主�"
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "contrib"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-free"
 msgstr ""
 
-#: src/generic/apt/apt.cc:1366
+#: src/generic/apt/apt.cc:1362
 msgid "non-US"
 msgstr ""
 
@@ -2752,34 +2729,42 @@ msgid ""
 "an integer)."
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:60
+#: src/generic/apt/download_install_manager.cc:64
 msgid ""
 "The package cache is not available; unable to download and install packages."
 msgstr "套件 cache ��用；無法下載並安�套件。"
 
-#: src/generic/apt/download_install_manager.cc:93
+#: src/generic/apt/download_install_manager.cc:97
 msgid "Internal error: couldn't generate list of packages to download"
 msgstr "內部錯誤：無法生�下載套件列表"
 
-#: src/generic/apt/download_install_manager.cc:120
+#: src/generic/apt/download_install_manager.cc:127
 #: src/generic/apt/download_update_manager.cc:130
 #, c-format
 msgid "Failed to fetch %s: %s"
 msgstr "下載 %s 失敗：%s"
 
-#: src/generic/apt/download_install_manager.cc:129
+#: src/generic/apt/download_install_manager.cc:136
 msgid "Some files failed to download"
 msgstr ""
 
-#: src/generic/apt/download_install_manager.cc:140
+#: src/generic/apt/download_install_manager.cc:147
+msgid ""
+"Unable to fetch some archives, maybe run aptitude update or try with --fix-"
+"missing?"
+msgstr ""
+"有部份套件檔無法�得，試著執行 aptitude update 或者試著加上 --fix-missing �"
+"項？"
+
+#: src/generic/apt/download_install_manager.cc:154
 msgid "Unable to correct for unavailable packages"
 msgstr "無法修正���得的套件"
 
-#: src/generic/apt/download_install_manager.cc:175
+#: src/generic/apt/download_install_manager.cc:196
 msgid "A package failed to install.  Trying to recover:"
 msgstr "套件安�失敗。正在試圖�復："
 
-#: src/generic/apt/download_install_manager.cc:219
+#: src/generic/apt/download_install_manager.cc:246
 msgid ""
 "Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"
 msgstr "無法�新�得系統鎖定�(也許�一個 apt 或 dpkg 正在執行？)"
@@ -2927,13 +2912,13 @@ msgstr ""
 "\n"
 "日誌完�。\n"
 
-#: src/generic/apt/matching/match.cc:3093
-#: src/generic/apt/matching/match.cc:3210
+#: src/generic/apt/matching/match.cc:3051
+#: src/generic/apt/matching/match.cc:3168
 msgid "Accessing index"
 msgstr ""
 
-#: src/generic/apt/matching/match.cc:3103
-#: src/generic/apt/matching/match.cc:3217
+#: src/generic/apt/matching/match.cc:3061
+#: src/generic/apt/matching/match.cc:3175
 #, fuzzy
 msgid "Filtering packages"
 msgstr "下載套件中"
@@ -3042,18 +3027,18 @@ msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "套件索引列表是�壞的。無套件 %s 的檔�: 欄�。"
 
-#: src/generic/apt/pkg_changelog.cc:441 src/generic/apt/pkg_changelog.cc:589
+#: src/generic/apt/pkg_changelog.cc:527 src/generic/apt/pkg_changelog.cc:652
 #: src/view_changelog.cc:272
 #, c-format
 msgid "Changelog of %s"
 msgstr "%s 的變更日誌"
 
-#: src/generic/apt/pkg_changelog.cc:565 src/generic/apt/pkg_changelog.cc:570
+#: src/generic/apt/pkg_changelog.cc:628 src/generic/apt/pkg_changelog.cc:633
 #, fuzzy, c-format
 msgid "Failed to download changelogs: %s"
 msgstr "用於下載變更日誌的 URL"
 
-#: src/generic/apt/pkg_changelog.cc:575
+#: src/generic/apt/pkg_changelog.cc:638
 #, fuzzy
 msgid "Failed to download changelogs: unexpected exception."
 msgstr "用於下載變更日誌的 URL"
@@ -3102,26 +3087,27 @@ msgstr ""
 msgid "Failed to parse the cost settings string: %s"
 msgstr "無法分�模� %s"
 
-#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:225
+#: src/generic/apt/tags.cc:218 src/generic/apt/tags.cc:226
+#: src/generic/apt/tags.cc:289 src/generic/apt/tags.cc:298
 msgid "Building tag database"
 msgstr "建立標簽資料庫"
 
-#: src/generic/apt/tags.cc:400
-msgid "legacy"
-msgstr ""
-
-#: src/generic/apt/tags.cc:430 src/generic/apt/tags.cc:445
-#: src/generic/apt/tags.cc:476 src/generic/apt/tags.cc:491
+#: src/generic/apt/tags.cc:486 src/generic/apt/tags.cc:501
+#: src/generic/apt/tags.cc:520 src/generic/apt/tags.cc:535
 #, fuzzy
 msgid "No tag descriptions are available."
 msgstr "尚未安�"
 
-#: src/generic/apt/tags.cc:436 src/generic/apt/tags.cc:451
-#: src/generic/apt/tags.cc:482 src/generic/apt/tags.cc:497
+#: src/generic/apt/tags.cc:492 src/generic/apt/tags.cc:507
+#: src/generic/apt/tags.cc:526 src/generic/apt/tags.cc:541
 #, fuzzy, c-format
 msgid "No description available for %s."
 msgstr "尚未安�"
 
+#: src/generic/apt/tags.cc:563
+msgid "legacy"
+msgstr ""
+
 #: src/generic/apt/tasks.cc:123
 #, c-format
 msgid "Unhandled packages method in task %s: %s"
@@ -3270,39 +3256,39 @@ msgstr ""
 msgid "_File"
 msgstr "�"
 
-#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2347
+#: src/gtk/aptitude.glade:28 src/gtk/aptitude.glade:2274 src/ui.cc:2349
 msgid "Perform all pending installs and removals"
 msgstr "執行所有等待執行的安�和移除作業"
 
-#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2350
+#: src/gtk/aptitude.glade:38 src/gtk/aptitude.glade:2285 src/ui.cc:2352
 msgid "Check for new versions of packages"
 msgstr "正在檢查新版本的套件"
 
-#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2355
+#: src/gtk/aptitude.glade:53 src/gtk/aptitude.glade:2301 src/ui.cc:2357
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr "為所有未被���狀的套件加上�級標記"
 
-#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2360
+#: src/gtk/aptitude.glade:63 src/gtk/aptitude.glade:2312 src/ui.cc:2362
 msgid "Forget which packages are \"new\""
 msgstr "忽略哪些套件是 '新' 的"
 
-#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2364
+#: src/gtk/aptitude.glade:72 src/gtk/aptitude.glade:2322 src/ui.cc:2366
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr "執行所有等待執行的安��移除���和�級作業。"
 
-#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2368
+#: src/gtk/aptitude.glade:81 src/gtk/aptitude.glade:2332 src/ui.cc:2370
 msgid "Delete package files which were previously downloaded"
 msgstr "刪除以�下載的套件檔案"
 
-#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2372
+#: src/gtk/aptitude.glade:90 src/gtk/aptitude.glade:2342 src/ui.cc:2374
 msgid "Delete package files which can no longer be downloaded"
 msgstr "刪除無法�下載的套件檔案"
 
-#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2379
+#: src/gtk/aptitude.glade:104 src/gtk/aptitude.glade:2357 src/ui.cc:2381
 msgid "Reload the package cache"
 msgstr "�新載入套件快�"
 
-#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2389
+#: src/gtk/aptitude.glade:118 src/gtk/aptitude.glade:2372 src/ui.cc:2391
 #, fuzzy
 #| msgid ""
 #| "Run 'su' to become root; this will restart the program, but your settings "
@@ -3310,7 +3296,7 @@ msgstr "�新載入套件快�"
 msgid "Restart the program as root; your settings will be preserved"
 msgstr "執行 'su' �為 root。這將�新啟動程�，但是您的設置將會被�存下來。"
 
-#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2392
+#: src/gtk/aptitude.glade:127 src/gtk/aptitude.glade:2382 src/ui.cc:2394
 msgid "Exit the program"
 msgstr "退出此程�"
 
@@ -3318,7 +3304,7 @@ msgstr "退出此程�"
 msgid "E_dit"
 msgstr ""
 
-#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2399
+#: src/gtk/aptitude.glade:148 src/gtk/aptitude.glade:2404 src/ui.cc:2401
 msgid "Undo the last package operation or group of operations"
 msgstr "復原最近一次或者一組�作"
 
@@ -3352,7 +3338,7 @@ msgid "_Help"
 msgstr "求助"
 
 #: src/gtk/aptitude.glade:317 src/gtk/aptitude.glade:2576
-#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1603 src/gtk/gui.cc:1801
+#: src/gtk/dashboardtab.cc:740 src/gtk/gui.cc:1595 src/gtk/gui.cc:1793
 msgid "Dashboard"
 msgstr ""
 
@@ -3361,19 +3347,19 @@ msgstr ""
 msgid "Update"
 msgstr "列表更新"
 
-#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1323
+#: src/gtk/aptitude.glade:347 src/gtk/aptitude.glade:2606 src/gtk/gui.cc:1315
 #: src/qt/tabs_manager.cc:241 src/ui.cc:854 src/ui.cc:856 src/ui.cc:901
 #: src/ui.cc:903 src/ui.cc:929 src/ui.cc:931 src/ui.cc:952 src/ui.cc:954
 msgid "Packages"
 msgstr "套件"
 
-#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1033
-#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1395
+#: src/gtk/aptitude.glade:358 src/gtk/aptitude.glade:2617 src/gtk/gui.cc:1034
+#: src/gtk/previewtab.cc:118 src/qt/tabs_manager.cc:220 src/ui.cc:1397
 msgid "Preview"
 msgstr "�覽"
 
-#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1028
-#: src/qt/tabs_manager.cc:263 src/ui.cc:2783
+#: src/gtk/aptitude.glade:369 src/gtk/aptitude.glade:2628 src/gtk/gui.cc:1029
+#: src/qt/tabs_manager.cc:263 src/ui.cc:2785
 msgid "Resolver"
 msgstr "解除器"
 
@@ -3560,7 +3546,7 @@ msgid "Fix Manually"
 msgstr "為手動"
 
 #: src/gtk/aptitude.glade:1656 src/gtk/areas.cc:72 src/gtk/gui.cc:93
-#: src/gtk/gui.cc:1408
+#: src/gtk/gui.cc:1400
 msgid "Upgrade"
 msgstr "�級"
 
@@ -4092,11 +4078,11 @@ msgstr "已安�"
 msgid "Reinstall"
 msgstr "�新安�"
 
-#: src/gtk/gui.cc:94 src/gtk/gui.cc:1414
+#: src/gtk/gui.cc:94 src/gtk/gui.cc:1406
 msgid "Downgrade"
 msgstr "�級"
 
-#: src/gtk/gui.cc:95 src/gtk/gui.cc:1424
+#: src/gtk/gui.cc:95 src/gtk/gui.cc:1416
 msgid "Remove"
 msgstr "移除"
 
@@ -4132,7 +4118,7 @@ msgstr "套用套件列表篩�"
 msgid "Download already running."
 msgstr "正在下載..."
 
-#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1526 src/ui.cc:1765
+#: src/gtk/gui.cc:300 src/gtk/gui.cc:948 src/ui.cc:1528 src/ui.cc:1767
 msgid "A package-list update or install run is already taking place."
 msgstr "已經開始了一個套件列表更新或者安�的動作。"
 
@@ -4193,37 +4179,37 @@ msgstr "無�毀的套件。"
 msgid "Asking whether to replace the configuration file %s"
 msgstr "無法用新的�置檔案代替 %s"
 
-#: src/gtk/gui.cc:962 src/ui.cc:1266
+#: src/gtk/gui.cc:963 src/ui.cc:1268
 msgid "Downloading packages"
 msgstr "下載套件中"
 
-#: src/gtk/gui.cc:1038
+#: src/gtk/gui.cc:1039
 #, fuzzy
 msgid "Broken packages"
 msgstr "無�毀的套件。"
 
-#: src/gtk/gui.cc:1071
+#: src/gtk/gui.cc:1072
 #, fuzzy
 msgid "Show broken packages"
 msgstr "無�毀的套件。"
 
-#: src/gtk/gui.cc:1075
+#: src/gtk/gui.cc:1076
 #, fuzzy
 msgid "Resolve dependencies"
 msgstr "解決相�賴關係"
 
-#: src/gtk/gui.cc:1103
+#: src/gtk/gui.cc:1104
 #, fuzzy, c-format
 msgid "%d package is broken"
 msgid_plural "%d packages are broken."
 msgstr[0] "沒有�毀的套件。"
 
-#: src/gtk/gui.cc:1147
+#: src/gtk/gui.cc:1148
 #, fuzzy
 msgid "View changes"
 msgstr "%s 個套件已改變"
 
-#: src/gtk/gui.cc:1151
+#: src/gtk/gui.cc:1152
 #, fuzzy
 msgid "Apply changes"
 msgstr "%s 個套件已改變"
@@ -4231,7 +4217,7 @@ msgstr "%s 個套件已改變"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1192
+#: src/gtk/gui.cc:1193
 #, fuzzy, c-format
 msgid "%d package to install"
 msgid_plural "%d packages to install"
@@ -4240,63 +4226,63 @@ msgstr[0] "%d 個�安�"
 #. ForTranslators: any numbers in this
 #. string will be displayed in a larger
 #. font.
-#: src/gtk/gui.cc:1207
+#: src/gtk/gui.cc:1208
 #, fuzzy, c-format
 msgid "%d package to remove"
 msgid_plural "%d packages to remove"
 msgstr[0] "無法移除 %s"
 
-#: src/gtk/gui.cc:1246
+#: src/gtk/gui.cc:1247
 #, fuzzy, c-format
 msgid "Download size: %sB."
 msgstr "下載檔案大�"
 
-#: src/gtk/gui.cc:1289
+#: src/gtk/gui.cc:1285
 #, c-format
 msgid "Tags of %s:\n"
 msgstr ""
 
-#: src/gtk/gui.cc:1345
+#: src/gtk/gui.cc:1337
 msgid "This feature is not implemented, yet."
 msgstr ""
 
-#: src/gtk/gui.cc:1351
+#: src/gtk/gui.cc:1343
 #, fuzzy
 msgid "Not implemented"
 msgstr "尚未安�"
 
-#: src/gtk/gui.cc:1403 src/gtk/gui.cc:1422
+#: src/gtk/gui.cc:1395 src/gtk/gui.cc:1414
 #, fuzzy
 msgid "Install/Upgrade"
 msgstr "已安�"
 
-#: src/gtk/gui.cc:1429
+#: src/gtk/gui.cc:1421
 #, fuzzy
 msgid "Purge"
 msgstr "清除(^P)"
 
-#: src/gtk/gui.cc:1434
+#: src/gtk/gui.cc:1426
 msgid "Keep"
 msgstr "�留"
 
-#: src/gtk/gui.cc:1439
+#: src/gtk/gui.cc:1431
 msgid "Hold"
 msgstr "��"
 
-#: src/gtk/gui.cc:1445
+#: src/gtk/gui.cc:1437
 msgid "Set as automatic"
 msgstr ""
 
-#: src/gtk/gui.cc:1450
+#: src/gtk/gui.cc:1442
 #, fuzzy
 msgid "Set as manual"
 msgstr "使用者手冊"
 
-#: src/gtk/gui.cc:1455
+#: src/gtk/gui.cc:1447
 msgid "Toggle automatic status"
 msgstr ""
 
-#: src/gtk/gui.cc:1780 src/gtk/init.cc:144
+#: src/gtk/gui.cc:1772 src/gtk/init.cc:144
 #, c-format
 msgid "Unable to load the user interface definition file %s/aptitude.glade."
 msgstr ""
@@ -4336,7 +4322,7 @@ msgstr "�"
 
 #: src/gtk/packageinformation.cc:104 src/gtk/packageinformation.cc:106
 #: src/pkg_columnizer.cc:354 src/pkg_columnizer.cc:375
-#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:275
+#: src/pkg_columnizer.cc:382 src/pkg_grouppolicy.cc:270
 #: src/pkg_info_screen.cc:134 src/pkg_info_screen.cc:135
 #: src/pkg_ver_item.cc:345 src/pkg_ver_item.cc:379 src/qt/package.cc:224
 #: src/qt/version.cc:114
@@ -4381,17 +4367,17 @@ msgstr "%s; 將會自動安�"
 msgid "Cache reloading, please wait..."
 msgstr ""
 
-#: src/gtk/pkgview.cc:607
+#: src/gtk/pkgview.cc:608
 #, fuzzy
 msgid "Searching..."
 msgstr "�尋"
 
-#: src/gtk/pkgview.cc:718
+#: src/gtk/pkgview.cc:719
 #, fuzzy
 msgid "Finalizing view"
 msgstr "建立視望中"
 
-#: src/gtk/pkgview.cc:718 src/pkg_tree.cc:204 src/pkg_tree.cc:215
+#: src/gtk/pkgview.cc:719 src/pkg_tree.cc:204 src/pkg_tree.cc:215
 #: src/pkg_tree.cc:226 src/pkg_tree.cc:238
 msgid "Building view"
 msgstr "建立視望中"
@@ -5067,108 +5053,109 @@ msgstr "未知的排列類型 '%s'"
 
 #: src/load_sortpolicy.cc:51 src/load_sortpolicy.cc:64
 #: src/load_sortpolicy.cc:77 src/load_sortpolicy.cc:90
+#: src/load_sortpolicy.cc:104
 #, fuzzy, c-format
 msgid "Sorting policy '%s' takes no arguments"
 msgstr "按�稱排�的策略�需��數"
 
-#: src/load_sortpolicy.cc:148
+#: src/load_sortpolicy.cc:164
 msgid "Invalid zero-length sorting policy name"
 msgstr "無效零長度排�策略�"
 
-#: src/load_sortpolicy.cc:166
+#: src/load_sortpolicy.cc:182
 msgid "Unmatched '(' in sorting policy description"
 msgstr "排�策略�述中�匹�的“(�"
 
-#: src/load_sortpolicy.cc:193
+#: src/load_sortpolicy.cc:209
 #, c-format
 msgid "Invalid sorting policy type '%s'"
 msgstr "無效的排�策略類型“%s�"
 
-#: src/main.cc:134
+#: src/main.cc:131
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr "無法�“%ls�之後的多字元字串進行解碼"
 
-#: src/main.cc:143
+#: src/main.cc:140
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr "無法�“%s�之後的寬字串進行解碼"
 
-#: src/main.cc:151
+#: src/main.cc:148
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s 編譯於 %s %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:151
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "編譯器：g++ %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:153
 msgid "Compiled against:\n"
 msgstr "編譯使用：\n"
 
-#: src/main.cc:157
+#: src/main.cc:154
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr "  apt 版本 %d.%d.%d\n"
 
-#: src/main.cc:160
+#: src/main.cc:157
 #, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr "NCurses 版本：未知\n"
 
-#: src/main.cc:162
+#: src/main.cc:159
 #, c-format
 msgid "  NCurses version %s\n"
 msgstr "NCurses 版本：%s\n"
 
-#: src/main.cc:164
+#: src/main.cc:161
 #, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr " libsigc++ 版本：%s\n"
 
-#: src/main.cc:166
+#: src/main.cc:163
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr "  支�Ept。\n"
 
-#: src/main.cc:168
+#: src/main.cc:165
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr "  �支� Ept\n"
 
-#: src/main.cc:171
+#: src/main.cc:168
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr "  apt 版本 %d.%d.%d\n"
 
-#: src/main.cc:173
+#: src/main.cc:170
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr "  apt 版本 %d.%d.%d\n"
 
-#: src/main.cc:176
+#: src/main.cc:173
 #, fuzzy, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr "  �支� Ept\n"
 
-#: src/main.cc:179
+#: src/main.cc:176
 #, fuzzy, c-format
 msgid "  Compiled with Qt %s\n"
 msgstr "%s %s 編譯於 %s %s\n"
 
-#: src/main.cc:180
+#: src/main.cc:177
 #, c-format
 msgid "  Running on Qt %s\n"
 msgstr ""
 
-#: src/main.cc:182
+#: src/main.cc:179
 #, fuzzy, c-format
 msgid "  Qt support disabled.\n"
 msgstr "  �支� Ept\n"
 
-#: src/main.cc:184
+#: src/main.cc:181
 msgid ""
 "\n"
 "Current library versions:\n"
@@ -5176,32 +5163,32 @@ msgstr ""
 "\n"
 "目�library版本：\n"
 
-#: src/main.cc:185
+#: src/main.cc:182
 #, c-format
 msgid "  NCurses version: %s\n"
 msgstr "NCurses 版本：%s\n"
 
-#: src/main.cc:186
+#: src/main.cc:183
 #, c-format
 msgid "  cwidget version: %s\n"
 msgstr "cwidget版本：%s\n"
 
-#: src/main.cc:187
+#: src/main.cc:184
 #, c-format
 msgid "  Apt version: %s\n"
 msgstr "Apt版本：%s\n"
 
-#: src/main.cc:193
+#: src/main.cc:190
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "用法： aptitude [-s 檔案�] [-u|-i]"
 
-#: src/main.cc:195
+#: src/main.cc:192
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [�項] <動作> ..."
 
-#: src/main.cc:197
+#: src/main.cc:194
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5210,118 +5197,118 @@ msgstr ""
 "  動作 (如果未指定，aptitude 將進入交互模�)：\n"
 "\n"
 
-#: src/main.cc:198
+#: src/main.cc:195
 #, fuzzy, c-format
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - 安�/�級套件\n"
 
-#: src/main.cc:199
+#: src/main.cc:196
 #, fuzzy, c-format
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - 移除套件\n"
 
-#: src/main.cc:200
+#: src/main.cc:197
 #, fuzzy, c-format
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - 移除套件並刪除其�置檔案\n"
 
-#: src/main.cc:201
+#: src/main.cc:198
 #, fuzzy, c-format
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - 將套件置於��狀態\n"
 
-#: src/main.cc:202
+#: src/main.cc:199
 #, fuzzy, c-format
 msgid " unhold       - Cancel a hold command for a package.\n"
 msgstr " unhold       - �消�一個套件的��命令\n"
 
-#: src/main.cc:203
+#: src/main.cc:200
 #, fuzzy, c-format
 msgid " markauto     - Mark packages as having been automatically installed.\n"
 msgstr " markauto     - 將套件標記為自動安�\n"
 
-#: src/main.cc:204
+#: src/main.cc:201
 #, fuzzy, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed.\n"
 msgstr " unmarkauto   - 將套件標記為手動安�\n"
 
-#: src/main.cc:205
+#: src/main.cc:202
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr " forbid-version - �止 aptitude �級特定的套件版本。\n"
 
-#: src/main.cc:206
+#: src/main.cc:203
 #, fuzzy, c-format
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - 下載新/��級套件列表\n"
 
-#: src/main.cc:207
+#: src/main.cc:204
 #, fuzzy, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " safe-upgrade - 執行一次安全的�級\n"
 
-#: src/main.cc:208
+#: src/main.cc:205
 #, fuzzy, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages.\n"
 msgstr " full-upgrade - 執行�級，�能會安�和移除套件\n"
 
-#: src/main.cc:209
+#: src/main.cc:206
 #, fuzzy, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr "'&BD' 安�套件的編譯相�套件。"
 
-#: src/main.cc:210
+#: src/main.cc:207
 #, fuzzy, c-format
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - 忽略哪些套件是“新�的\n"
 
-#: src/main.cc:211
+#: src/main.cc:208
 #, fuzzy, c-format
 msgid " search       - Search for a package by name and/or expression.\n"
 msgstr " search       - 按�稱 和/或 表���尋套件\n"
 
-#: src/main.cc:212
+#: src/main.cc:209
 #, fuzzy, c-format
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - 顯示套件細節資訊\n"
 
-#: src/main.cc:213
+#: src/main.cc:210
 #, fuzzy, c-format
 msgid " versions     - Displays the versions of specified packages.\n"
 msgstr " show         - 顯示套件細節資訊\n"
 
-#: src/main.cc:214
+#: src/main.cc:211
 #, fuzzy, c-format
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - 刪除已下載的套件檔案\n"
 
-#: src/main.cc:215
+#: src/main.cc:212
 #, fuzzy, c-format
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - 刪除舊的已下載套件檔案\n"
 
-#: src/main.cc:216
+#: src/main.cc:213
 #, fuzzy, c-format
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - 查看套件的更改紀錄\n"
 
-#: src/main.cc:217
+#: src/main.cc:214
 #, fuzzy, c-format
 msgid " download     - Download the .deb file for a package.\n"
 msgstr " download     - 下載套件的 .deb 檔案\n"
 
-#: src/main.cc:218
+#: src/main.cc:215
 #, fuzzy, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
 msgstr " reinstall    - 下載並(�能)�新安�一個�在已經安�了的套件\n"
 
-#: src/main.cc:219
+#: src/main.cc:216
 #, fuzzy, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5332,7 +5319,7 @@ msgstr ""
 "or\n"
 "                why one or more packages would require the given package\n"
 
-#: src/main.cc:221
+#: src/main.cc:218
 #, fuzzy, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5344,286 +5331,266 @@ msgstr ""
 "                或為何安�指定套件時會導致一個或更\n"
 "                多的套件產生��\n"
 
-#: src/main.cc:225
+#: src/main.cc:222
 #, c-format
 msgid "  Options:\n"
 msgstr "  �項：\n"
 
-#: src/main.cc:226
+#: src/main.cc:223
 #, fuzzy, c-format
 msgid " -h             This help text.\n"
 msgstr " -h             此求助純文字\n"
 
-#: src/main.cc:228
+#: src/main.cc:225
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:230
+#: src/main.cc:227
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:232
+#: src/main.cc:229
 #, fuzzy, c-format
 msgid " --qt           Use the Qt GUI.\n"
 msgstr " -h             此求助純文字\n"
 
-#: src/main.cc:233
+#: src/main.cc:230
 #, c-format
 msgid ""
 " --no-qt        Do not use the Qt GUI even if enabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:235
+#: src/main.cc:232
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr " -s             模擬動作，但是並�真正執行。\n"
 
-#: src/main.cc:236
+#: src/main.cc:233
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr " -d             僅僅下載套件，�安�或者移除任何�西。\n"
 
-#: src/main.cc:237
+#: src/main.cc:234
 #, fuzzy, c-format
 msgid " -P             Always prompt for confirmation of actions.\n"
 msgstr " -P             總是�示確�執行動作\n"
 
-#: src/main.cc:238
+#: src/main.cc:235
 #, fuzzy, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'.\n"
 msgstr " -y             �設�簡單的 是/� �題回答“是�\n"
 
-#: src/main.cc:239
+#: src/main.cc:236
 #, fuzzy, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual.\n"
 msgstr " -F 格�        指定顯示�尋�果的格�；�見手冊\n"
 
-#: src/main.cc:240
+#: src/main.cc:237
 #, fuzzy, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the "
 "manual.\n"
 msgstr " -O 次�        指定如何排列顯示�尋�果；�見手冊\n"
 
-#: src/main.cc:241
+#: src/main.cc:238
 #, fuzzy, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results.\n"
 msgstr " -w 寬度        指定顯示�尋�果的格�寬度\n"
 
-#: src/main.cc:242
+#: src/main.cc:239
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             �極地嘗試修復�壞的套件。\n"
 
-#: src/main.cc:243
+#: src/main.cc:240
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr " -V             顯示就�安�的套件版本。\n"
 
-#: src/main.cc:244
+#: src/main.cc:241
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             顯示自動改變的套件的�賴關係\n"
 
-#: src/main.cc:245
+#: src/main.cc:242
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr " -Z\t\t    顯示�個套件的安�尺寸的變化。\n"
 
-#: src/main.cc:246
+#: src/main.cc:243
 #, fuzzy, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple "
 "times).\n"
 msgstr " -v             顯示附加訊�。(�能會�供多次) \n"
 
-#: src/main.cc:247
+#: src/main.cc:244
 #, fuzzy, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed.\n"
 msgstr " -t [release]   設置將�安�的套件的發布版本\n"
 
-#: src/main.cc:248
+#: src/main.cc:245
 #, fuzzy, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress\n"
 "                indicators.\n"
 msgstr " -q            在命令列狀態下，�顯示進度。\n"
 
-#: src/main.cc:250
+#: src/main.cc:247
 #, fuzzy, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'.\n"
 msgstr " -o key=val     直接指定�稱為 'key' 的設定�項\n"
 
-#: src/main.cc:251
+#: src/main.cc:248
 #, fuzzy, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies.\n"
 msgstr " --with(out)-recommends\t指定是�將推薦(建議)處�為強�賴關係。\n"
 
-#: src/main.cc:253
+#: src/main.cc:250
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr " -S fname       從檔案�中讀� aptitude 的延伸狀態資訊。\n"
 
-#: src/main.cc:254
+#: src/main.cc:251
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             開始執行時下載新的套件列表。\n"
 
-#: src/main.cc:255 src/main.cc:257
+#: src/main.cc:252 src/main.cc:254
 #, fuzzy, c-format
 msgid "                  (terminal interface only)\n"
 msgstr " -h             此求助純文字\n"
 
-#: src/main.cc:256
+#: src/main.cc:253
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             開始執行時執行安�。\n"
 
-#: src/main.cc:259
+#: src/main.cc:256
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr "                  這個 aptitude 無超級牛力。\n"
 
 #. ForTranslators: This is a log level that the user can pass on
 #. the command-line or set in the configuration file.
-#: src/main.cc:393
+#: src/main.cc:359
 #, fuzzy
 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:396
+#: src/main.cc:362
 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:399
+#: src/main.cc:365
 #, fuzzy
 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:402
+#: src/main.cc:368
 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:405
+#: src/main.cc:371
 #, fuzzy
 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:408
+#: src/main.cc:374
 #, fuzzy
 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:411
+#: src/main.cc:377
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:479
+#: src/main.cc:445
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:488
+#: src/main.cc:456
 #, fuzzy, c-format
-msgid "Invalid logger name \"%s\"."
+msgid "Invalid logger name \"%s\""
 msgstr "無效的�作“%s�"
 
-#: src/main.cc:765
-#, c-format
-msgid "Expected a number after -q=\n"
-msgstr "在 -q= 之後需�一個數字\n"
-
-#: src/main.cc:774
-#, c-format
-msgid "Expected a number after -q=, got %s\n"
-msgstr "在 -q= 之後需�一個數字，但�得到 %s\n"
-
-#: src/main.cc:798
-#, c-format
-msgid "-o requires an argument of the form key=value, got %s\n"
-msgstr "-o 需�如key=value格�的�數，�得到%s\n"
-
-#: src/main.cc:888
-#, c-format
-msgid "No comma following tag name \"%s\".\n"
-msgstr "標誌“%s�後沒有逗點。\n"
-
-#: src/main.cc:980 src/main.cc:990
-msgid "WEIRDNESS: unknown option code received\n"
-msgstr "詭異：收到未知的�項代碼\n"
+#: src/main.cc:729
+msgid "Conflicting command line options --safe-resolver and --full-resolver"
+msgstr ""
 
-#: src/main.cc:1008
+#: src/main.cc:765
 msgid "--show-package-names|never"
 msgstr ""
 
-#: src/main.cc:1011
+#: src/main.cc:768
 msgid "--show-package-names|auto"
 msgstr ""
 
-#: src/main.cc:1014
+#: src/main.cc:771
 msgid "--show-package-names|always"
 msgstr ""
 
-#: src/main.cc:1019
+#: src/main.cc:774
 #, c-format
 msgid ""
 "Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
 "\"always\")."
 msgstr ""
 
-#: src/main.cc:1025
+#: src/main.cc:779
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:1027
+#: src/main.cc:781
 #, fuzzy
 msgid "first-package"
 msgstr "套件"
 
-#: src/main.cc:1029
+#: src/main.cc:783
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:1031
+#: src/main.cc:785
 #, fuzzy
 msgid "all-packages"
 msgstr "全部包"
 
-#: src/main.cc:1033
+#: src/main.cc:787
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:1039
+#: src/main.cc:792
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5631,36 +5598,31 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:1079
+#: src/main.cc:831
 #, fuzzy
 msgid ""
 "Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be "
-"specified\n"
+"specified"
 msgstr "�項 -u 和 -i �能指定一個\n"
 
-#: src/main.cc:1088
+#: src/main.cc:837
 #, fuzzy
 msgid ""
-"-u, -i, and --clean-on-startup may not be specified in command-line mode "
-"(eg, with 'install')"
+"-u, -i, --clean-on-startup, and --autoclean-on-startup may not be specified "
+"in command-line mode (eg, with 'install')"
 msgstr "�項 -u 和 -i �能在命令行模�中指定 (例如，和“install�一起)"
 
-#: src/main.cc:1105
-#, fuzzy
-msgid "-u, -i, and --clean-on-startup may not be specified with a command"
-msgstr "�項 -u 和 -i �能在和一個命令一起指定 "
-
-#: src/main.cc:1216
+#: src/main.cc:969
 #, c-format
-msgid "Unknown command \"%s\"\n"
-msgstr "未知的命令“%s�\n"
+msgid "Unknown command \"%s\""
+msgstr "未知的命令“%s�"
 
-#: src/main.cc:1228 src/main.cc:1313
+#: src/main.cc:997 src/main.cc:1082
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr "未知的例外：%s\n"
 
-#: src/main.cc:1232 src/main.cc:1317
+#: src/main.cc:1001 src/main.cc:1086
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -5678,7 +5640,7 @@ msgstr "�尋："
 msgid "Search backwards for: "
 msgstr "���尋："
 
-#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1770
+#: src/mine/cmine.cc:115 src/mine/cmine.cc:154 src/ui.cc:1772
 msgid "Minesweeper"
 msgstr "掃雷"
 
@@ -5887,7 +5849,7 @@ msgstr "mine-help.txt 的編碼|UTF-8"
 msgid "30 8 8 1 1 40 14 14 11 10 35 9 10 2 1 1 10 9 12 30 17 15"
 msgstr "30 6 6 1 1 40 14 14 11 10 35 9 10 2 1 1 10 12 30 15 15"
 
-#: src/pkg_columnizer.cc:89 src/ui.cc:2782
+#: src/pkg_columnizer.cc:89 src/ui.cc:2784
 msgid "Package"
 msgstr "套件"
 
@@ -5968,8 +5930,8 @@ msgstr "<��用>"
 msgid "<none>"
 msgstr "<ç„¡>"
 
-#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:269
-#: src/pkg_grouppolicy.cc:1815 src/qt/package.cc:234
+#: src/pkg_columnizer.cc:238 src/pkg_grouppolicy.cc:264
+#: src/pkg_grouppolicy.cc:1750 src/qt/package.cc:234
 #: src/qt/widgets/packages_tab.cc:73
 msgid "virtual"
 msgstr "虛擬"
@@ -6103,7 +6065,7 @@ msgstr "在“%ls�之後無法解�套件顯示格�"
 msgid "Internal error: Default column string is unparsable"
 msgstr "內部錯誤：�設欄字符串無法解�"
 
-#: src/pkg_grouppolicy.cc:264 src/pkg_grouppolicy.cc:1127
+#: src/pkg_grouppolicy.cc:275 src/pkg_grouppolicy.cc:1127
 msgid "Tasks"
 msgstr "作業"
 
@@ -6253,11 +6215,11 @@ msgstr "匹�索引必須大於等於 1，而�是“%s�"
 msgid "Match index %ls is too large; available groups are (%s)"
 msgstr "匹�索引 %ls 太大了；�用的組為 (%s)"
 
-#: src/pkg_grouppolicy.cc:1560
+#: src/pkg_grouppolicy.cc:1523
 msgid "TAGLESS PACKAGES"
 msgstr "沒有標簽的套件"
 
-#: src/pkg_grouppolicy.cc:1561
+#: src/pkg_grouppolicy.cc:1524
 msgid ""
 "\n"
 " These packages have not yet been classified in debtags, or the debtags "
@@ -6267,10 +6229,6 @@ msgstr ""
 "這些套件尚未被 debtags 驗證，或是�存在 debtags 資料庫(安� debtags �修正這"
 "個�題)。"
 
-#: src/pkg_grouppolicy.cc:1601
-msgid "MISSING TAG"
-msgstr "缺少標簽"
-
 #: src/pkg_info_screen.cc:140
 msgid "Source Package: "
 msgstr "�碼套件："
@@ -6851,7 +6809,7 @@ msgstr "載入快�"
 msgid "Really quit Aptitude?"
 msgstr "真的�退出 Aptitude 嗎？"
 
-#: src/ui.cc:714 src/ui.cc:2545
+#: src/ui.cc:714 src/ui.cc:2547
 msgid "Change the behavior of aptitude"
 msgstr "變更aptitude的�作"
 
@@ -6930,7 +6888,7 @@ msgstr ""
 msgid "License"
 msgstr "授權�款"
 
-#: src/ui.cc:1086 src/ui.cc:2637
+#: src/ui.cc:1086 src/ui.cc:2639
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr "查看您�以在何種�款下複製和散佈aptitude"
 
@@ -6951,7 +6909,7 @@ msgstr "線上求助"
 msgid "View a brief introduction to aptitude"
 msgstr "檢視 aptitude 的簡易介紹"
 
-#: src/ui.cc:1116 src/ui.cc:2787
+#: src/ui.cc:1116 src/ui.cc:2789
 msgid "Help"
 msgstr "求助"
 
@@ -6980,7 +6938,7 @@ msgstr "為手動"
 msgid "FAQ"
 msgstr "常見�題"
 
-#: src/ui.cc:1147 src/ui.cc:2629
+#: src/ui.cc:1147 src/ui.cc:2631
 msgid "View a list of frequently asked questions"
 msgstr "�覽常見�題列表"
 
@@ -7018,15 +6976,15 @@ msgstr ""
 "�以安�的刪除。%n%n你�刪除這些目錄和裡�的內容嗎？如果你�擇“��，你將�會"
 "�看到這�訊�。"
 
-#: src/ui.cc:1267
+#: src/ui.cc:1269
 msgid "View the progress of the package download"
 msgstr "檢視套件下載進度"
 
-#: src/ui.cc:1268
+#: src/ui.cc:1270
 msgid "Package Download"
 msgstr "套件下載"
 
-#: src/ui.cc:1315
+#: src/ui.cc:1317
 msgid ""
 "%BWARNING%b: untrusted versions of the following packages will be installed!"
 "%n%nUntrusted packages could %Bcompromise your system's security%b.  You "
@@ -7036,61 +6994,61 @@ msgstr ""
 "%B[警告]%b：將會安�以下版本未�信賴的套件�%n%n未�信賴的套件有�能會%B�害"
 "到您系統的安全%b。 �有在您確定您真的�這麼�時，您��以進行安�作業。%n%n"
 
-#: src/ui.cc:1321
+#: src/ui.cc:1323
 msgid "  %S*%N %s [version %s]%n"
 msgstr "  %S*%N %s [version %s]%n"
 
-#: src/ui.cc:1327
+#: src/ui.cc:1329
 msgid "Really Continue"
 msgstr "繼續進行"
 
-#: src/ui.cc:1329
+#: src/ui.cc:1331
 msgid "Abort Installation"
 msgstr "放棄安�"
 
-#: src/ui.cc:1393
+#: src/ui.cc:1395
 msgid "Preview of package installation"
 msgstr "�覽套件安�"
 
-#: src/ui.cc:1394
+#: src/ui.cc:1396
 msgid "View and/or adjust the actions that will be performed"
 msgstr "檢視與/或調整�將執行的指令"
 
-#: src/ui.cc:1456
+#: src/ui.cc:1458
 msgid "Some packages were broken and have been fixed:"
 msgstr "�些毀斷的套件已經被修補�"
 
-#: src/ui.cc:1464
+#: src/ui.cc:1466
 msgid "No solution to these dependency problems exists!"
 msgstr "這些相�賴關係沒有解決方案�"
 
-#: src/ui.cc:1470
+#: src/ui.cc:1472
 #, c-format
 msgid ""
 "Ran out of time while trying to resolve dependencies (press \"%s\" to try "
 "harder)"
 msgstr "試圖�尋解決方案時用時已盡 (按“%s�加把�兒�試試)"
 
-#: src/ui.cc:1516
+#: src/ui.cc:1518
 msgid ""
 "Installing/removing packages requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 "安�/刪除套件需�管�員權�，而您�在沒有這種權�。您想�進入 root 帳號嗎？"
 
-#: src/ui.cc:1519 src/ui.cc:1758 src/ui.cc:1819 src/ui.cc:1914
+#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
 msgid "Become root"
 msgstr "變� root(^B)"
 
-#: src/ui.cc:1521 src/ui.cc:1760 src/ui.cc:1821 src/ui.cc:1916
+#: src/ui.cc:1523 src/ui.cc:1762 src/ui.cc:1823 src/ui.cc:1918
 msgid "Don't become root"
 msgstr "�變� root"
 
-#: src/ui.cc:1642
+#: src/ui.cc:1644
 msgid "No packages are scheduled to be installed, removed, or upgraded."
 msgstr "沒有套件被�定安���級或移除。"
 
-#: src/ui.cc:1648
+#: src/ui.cc:1650
 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 "
@@ -7099,42 +7057,42 @@ msgstr ""
 "沒有套件將被安��移除或�級。�些套件�以被�級，但是您並沒有�擇�級它們。"
 "輸入 \"U\" 來準備�級。"
 
-#: src/ui.cc:1728
+#: src/ui.cc:1730
 msgid "Updating package lists"
 msgstr "正在更新套件列表"
 
-#: src/ui.cc:1729
+#: src/ui.cc:1731
 msgid "View the progress of the package list update"
 msgstr "檢視套件�級進度"
 
-#: src/ui.cc:1730
+#: src/ui.cc:1732
 msgid "List Update"
 msgstr "列表更新"
 
-#: src/ui.cc:1755
+#: src/ui.cc:1757
 msgid ""
 "Updating the package lists requires administrative privileges, which you "
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 "更新套件列表需�管�員權�，而您�在沒有這種權�。您想�進入 root 帳號嗎？"
 
-#: src/ui.cc:1770 src/ui.cc:2384
+#: src/ui.cc:1772 src/ui.cc:2386
 msgid "Waste time trying to find mines"
 msgstr "玩玩踩地雷來消磨時間"
 
-#: src/ui.cc:1777 src/ui.cc:1865
+#: src/ui.cc:1779 src/ui.cc:1867
 msgid "Cleaning while a download is in progress is not allowed"
 msgstr "在下載進行�程中��許執行清除"
 
-#: src/ui.cc:1792
+#: src/ui.cc:1794
 msgid "Deleting downloaded files"
 msgstr "刪除下載的檔案"
 
-#: src/ui.cc:1806
+#: src/ui.cc:1808
 msgid "Downloaded package files have been deleted"
 msgstr "下載的檔案已經被刪除"
 
-#: src/ui.cc:1816
+#: src/ui.cc:1818
 #, fuzzy
 msgid ""
 "Cleaning the package cache requires administrative privileges, which you "
@@ -7142,18 +7100,18 @@ msgid ""
 msgstr ""
 "更新套件列表需�管�員權�，而您�在沒有這種權�。您想�進入 root 帳號嗎？"
 
-#: src/ui.cc:1862
+#: src/ui.cc:1864
 msgid "The apt cache file is not available; cannot auto-clean."
 msgstr "套件 cache ��用：無法 auto-clean 。"
 
-#: src/ui.cc:1900
+#: src/ui.cc:1902
 #, c-format
 msgid ""
 "Obsolete downloaded package files have been deleted, freeing %sB of disk "
 "space."
 msgstr "�期的下載檔案已經被刪除，正在釋放 %sB 的�碟空間。"
 
-#: src/ui.cc:1911
+#: src/ui.cc:1913
 #, fuzzy
 msgid ""
 "Deleting obsolete files requires administrative privileges, which you "
@@ -7161,169 +7119,169 @@ msgid ""
 msgstr ""
 "更新套件列表需�管�員權�，而您�在沒有這種權�。您想�進入 root 帳號嗎？"
 
-#: src/ui.cc:2013
+#: src/ui.cc:2015
 msgid "No more solutions."
 msgstr "沒有更多的解決方案了。"
 
-#: src/ui.cc:2221
+#: src/ui.cc:2223
 msgid "Unable to find a solution to apply."
 msgstr "未能找到一個�以應用的解決方案。"
 
-#: src/ui.cc:2227
+#: src/ui.cc:2229
 msgid "Ran out of time while trying to find a solution."
 msgstr "尋找解決方案時用時已盡。"
 
-#: src/ui.cc:2287 src/ui.cc:2289
+#: src/ui.cc:2289 src/ui.cc:2291
 msgid "Resolve Dependencies"
 msgstr "解決相�賴關係"
 
-#: src/ui.cc:2288
+#: src/ui.cc:2290
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr "為未滿足的相�關係尋找解決方案"
 
-#: src/ui.cc:2300
+#: src/ui.cc:2302
 #, c-format
 msgid "Unable to open %ls"
 msgstr "無法打開 %ls"
 
-#: src/ui.cc:2306
+#: src/ui.cc:2308
 msgid "Error while dumping resolver state"
 msgstr "傾�相�關係解決狀態時出錯"
 
-#: src/ui.cc:2346
+#: src/ui.cc:2348
 msgid "^Install/remove packages"
 msgstr "安�/移除套件(^I)"
 
-#: src/ui.cc:2349
+#: src/ui.cc:2351
 msgid "^Update package list"
 msgstr "更新套件列表(^U)"
 
-#: src/ui.cc:2354
+#: src/ui.cc:2356
 msgid "Mark Up^gradable"
 msgstr "標記為��級(^U)"
 
-#: src/ui.cc:2359
+#: src/ui.cc:2361
 msgid "^Forget new packages"
 msgstr "忽略新套件(^F)"
 
-#: src/ui.cc:2363
+#: src/ui.cc:2365
 msgid "Canc^el pending actions"
 msgstr "�消待執行的動作(^E)"
 
-#: src/ui.cc:2367
+#: src/ui.cc:2369
 msgid "^Clean package cache"
 msgstr "清除套件快�(^C)"
 
-#: src/ui.cc:2371
+#: src/ui.cc:2373
 msgid "Clean ^obsolete files"
 msgstr "關閉�期檔案(^O)"
 
-#: src/ui.cc:2378
+#: src/ui.cc:2380
 msgid "^Reload package cache"
 msgstr "�新載入套件快�(^R)"
 
-#: src/ui.cc:2383
+#: src/ui.cc:2385
 msgid "^Play Minesweeper"
 msgstr "玩採地雷(^P)"
 
-#: src/ui.cc:2388
+#: src/ui.cc:2390
 msgid "^Become root"
 msgstr "變� root(^B)"
 
-#: src/ui.cc:2391
+#: src/ui.cc:2393
 msgid "^Quit"
 msgstr "退出(^Q)"
 
-#: src/ui.cc:2398 src/ui.cc:2781
+#: src/ui.cc:2400 src/ui.cc:2783
 msgid "Undo"
 msgstr "復原"
 
-#: src/ui.cc:2407
+#: src/ui.cc:2409
 msgid "^Install"
 msgstr "安�(^I)"
 
-#: src/ui.cc:2408
+#: src/ui.cc:2410
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr "標示安�或�級��的套件"
 
-#: src/ui.cc:2411
+#: src/ui.cc:2413
 msgid "^Remove"
 msgstr "移除(^R)"
 
-#: src/ui.cc:2412
+#: src/ui.cc:2414
 msgid "Flag the currently selected package for removal"
 msgstr "標示移除��的套件"
 
-#: src/ui.cc:2415
+#: src/ui.cc:2417
 msgid "^Purge"
 msgstr "清除(^P)"
 
-#: src/ui.cc:2416
+#: src/ui.cc:2418
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr "標示移除��的套件與其設定檔"
 
-#: src/ui.cc:2419
+#: src/ui.cc:2421
 msgid "^Keep"
 msgstr "�留(^K)"
 
-#: src/ui.cc:2420
+#: src/ui.cc:2422
 msgid "Cancel any action on the selected package"
 msgstr "�消�擇的套件上的任何動作"
 
-#: src/ui.cc:2423
+#: src/ui.cc:2425
 msgid "^Hold"
 msgstr "�留(^H)"
 
-#: src/ui.cc:2424
+#: src/ui.cc:2426
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr "�消在�擇套件的任何指令，並�證未來也��級"
 
-#: src/ui.cc:2427
+#: src/ui.cc:2429
 msgid "Mark ^Auto"
 msgstr "標示為自動(^A)"
 
-#: src/ui.cc:2428
+#: src/ui.cc:2430
 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:2431
+#: src/ui.cc:2433
 msgid "Mark ^Manual"
 msgstr "標示為手動處�(^M)"
 
-#: src/ui.cc:2432
+#: src/ui.cc:2434
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr "標示手動安��擇的套件;除�您手動移除，�則它將�會被移除"
 
-#: src/ui.cc:2435
+#: src/ui.cc:2437
 msgid "^Forbid Version"
 msgstr "�制版本(^F)"
 
-#: src/ui.cc:2436
+#: src/ui.cc:2438
 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:2440
+#: src/ui.cc:2442
 msgid "I^nformation"
 msgstr "資訊(^n)"
 
-#: src/ui.cc:2441
+#: src/ui.cc:2443
 msgid "Display more information about the selected package"
 msgstr "顯示�擇的套件之細節資訊"
 
-#: src/ui.cc:2444
+#: src/ui.cc:2446
 msgid "C^ycle Package Information"
 msgstr "C^循環檢視套件資訊"
 
-#: src/ui.cc:2445
+#: src/ui.cc:2447
 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 "
@@ -7332,324 +7290,324 @@ msgstr ""
 "循環檢視套件的資料欄。它�顯示套件的進階�述，相�狀態摘�或套件是必須安�的"
 "分�。"
 
-#: src/ui.cc:2448
+#: src/ui.cc:2450
 msgid "^Changelog"
 msgstr "變更紀錄(^C)"
 
-#: src/ui.cc:2449
+#: src/ui.cc:2451
 msgid "Display the Debian changelog of the selected package"
 msgstr "顯示�擇套件的 Debian 更改紀錄"
 
-#: src/ui.cc:2456
+#: src/ui.cc:2458
 msgid "^Examine Solution"
 msgstr "檢查解決方案(^E)"
 
-#: src/ui.cc:2457
+#: src/ui.cc:2459
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr "檢查當��擇的處�相��題的解決方案"
 
-#: src/ui.cc:2460
+#: src/ui.cc:2462
 msgid "Apply ^Solution"
 msgstr "套用解決方案(^S)"
 
-#: src/ui.cc:2461
+#: src/ui.cc:2463
 msgid "Perform the actions contained in the currently selected solution."
 msgstr "確�當��擇的解決方案中包�的動作。"
 
-#: src/ui.cc:2464
+#: src/ui.cc:2466
 msgid "^Next Solution"
 msgstr "下一個解決方案(^N)"
 
-#: src/ui.cc:2465
+#: src/ui.cc:2467
 msgid "Select the next solution to the dependency problems."
 msgstr "�擇解決此�賴�題的下一個方案。"
 
-#: src/ui.cc:2468
+#: src/ui.cc:2470
 msgid "^Previous Solution"
 msgstr "�一個解決方案(^P)"
 
-#: src/ui.cc:2469
+#: src/ui.cc:2471
 msgid "Select the previous solution to the dependency problems."
 msgstr "�擇解決此�賴�題的�一個方案。"
 
-#: src/ui.cc:2472
+#: src/ui.cc:2474
 msgid "^First Solution"
 msgstr "第一個解決方案(^F)"
 
-#: src/ui.cc:2473
+#: src/ui.cc:2475
 msgid "Select the first solution to the dependency problems."
 msgstr "�擇解決此�賴�題的第一個方案。"
 
-#: src/ui.cc:2476
+#: src/ui.cc:2478
 msgid "^Last Solution"
 msgstr "最後一個解決方案(^L)"
 
-#: src/ui.cc:2477
+#: src/ui.cc:2479
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr "�擇當�已經生�的解決此�賴�題的最後一個方案。"
 
-#: src/ui.cc:2483
+#: src/ui.cc:2485
 msgid "Toggle ^Rejected"
 msgstr "放棄(^R)"
 
-#: src/ui.cc:2484
+#: src/ui.cc:2486
 msgid "Toggle whether the currently selected action is rejected."
 msgstr "切�是�放棄當��擇的動作。"
 
-#: src/ui.cc:2488
+#: src/ui.cc:2490
 msgid "Toggle ^Approved"
 msgstr "確�(^A)"
 
-#: src/ui.cc:2489
+#: src/ui.cc:2491
 msgid "Toggle whether the currently selected action is approved."
 msgstr "切�當��擇的動作是�被�許。"
 
-#: src/ui.cc:2493
+#: src/ui.cc:2495
 msgid "^View Target"
 msgstr "查看目標(^V)"
 
-#: src/ui.cc:2494
+#: src/ui.cc:2496
 msgid "View the package which will be affected by the selected action"
 msgstr "查看會被所�的動作影響的套件"
 
-#: src/ui.cc:2500
+#: src/ui.cc:2502
 msgid "Reject Breaking ^Holds"
 msgstr "�決�毀 ^Holds"
 
-#: src/ui.cc:2502
+#: src/ui.cc:2504
 msgid ""
 "Reject all actions that would change the state of held packages or install "
 "forbidden versions"
 msgstr "撒回所有更改被�留或�止安�的套件的動作"
 
-#: src/ui.cc:2510
+#: src/ui.cc:2512
 msgid "^Find"
 msgstr "尋找(^F)"
 
-#: src/ui.cc:2511
+#: src/ui.cc:2513
 msgid "Search forwards"
 msgstr "���尋："
 
-#: src/ui.cc:2514
+#: src/ui.cc:2516
 msgid "^Find Backwards"
 msgstr "�後尋找(^F)"
 
-#: src/ui.cc:2515
+#: src/ui.cc:2517
 msgid "Search backwards"
 msgstr "�後�尋："
 
-#: src/ui.cc:2518
+#: src/ui.cc:2520
 msgid "Find ^Again"
 msgstr "�新尋找(^A)"
 
-#: src/ui.cc:2519
+#: src/ui.cc:2521
 msgid "Repeat the last search"
 msgstr "�複最後尋找"
 
-#: src/ui.cc:2522
+#: src/ui.cc:2524
 msgid "Find Again ^Backwards"
 msgstr "�後尋找(^F)"
 
-#: src/ui.cc:2523
+#: src/ui.cc:2525
 msgid "Repeat the last search in the opposite direction"
 msgstr "�複最後尋找"
 
-#: src/ui.cc:2527
+#: src/ui.cc:2529
 msgid "^Limit Display"
 msgstr "�制顯示(^L)"
 
-#: src/ui.cc:2528
+#: src/ui.cc:2530
 msgid "Apply a filter to the package list"
 msgstr "套用套件列表篩�"
 
-#: src/ui.cc:2531
+#: src/ui.cc:2533
 msgid "^Un-Limit Display"
 msgstr "無�制顯示(^U)"
 
-#: src/ui.cc:2532
+#: src/ui.cc:2534
 msgid "Remove the filter from the package list"
 msgstr "移除套件列表的篩�"
 
-#: src/ui.cc:2536
+#: src/ui.cc:2538
 msgid "Find ^Broken"
 msgstr "�尋�壞套件(^B)"
 
-#: src/ui.cc:2537
+#: src/ui.cc:2539
 msgid "Find the next package with unsatisfied dependencies"
 msgstr "尋找下個未滿足相�性的套件"
 
-#: src/ui.cc:2544
+#: src/ui.cc:2546
 msgid "^Preferences"
 msgstr "^�項"
 
-#: src/ui.cc:2549
+#: src/ui.cc:2551
 msgid "^UI options"
 msgstr "用戶界��項(^U)"
 
-#: src/ui.cc:2550
+#: src/ui.cc:2552
 msgid "Change the settings which affect the user interface"
 msgstr "修改影響用戶界�的設置"
 
-#: src/ui.cc:2553
+#: src/ui.cc:2555
 msgid "^Dependency handling"
 msgstr "處��賴關係(^D)"
 
-#: src/ui.cc:2554
+#: src/ui.cc:2556
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr "改變影響處��賴關係的設置"
 
-#: src/ui.cc:2557
+#: src/ui.cc:2559
 msgid "^Miscellaneous"
 msgstr "雜項(^M)"
 
-#: src/ui.cc:2558
+#: src/ui.cc:2560
 msgid "Change miscellaneous program settings"
 msgstr "改變程�的雜項設置"
 
-#: src/ui.cc:2564
+#: src/ui.cc:2566
 msgid "^Revert options"
 msgstr "還原�項(^R)"
 
-#: src/ui.cc:2565
+#: src/ui.cc:2567
 msgid "Reset all settings to the system defaults"
 msgstr "把所有項目�設為它們的�設值"
 
-#: src/ui.cc:2576
+#: src/ui.cc:2578
 msgid "^Next"
 msgstr "下一個(^N)"
 
-#: src/ui.cc:2577
+#: src/ui.cc:2579
 msgid "View next display"
 msgstr "查看下一個畫�"
 
-#: src/ui.cc:2580
+#: src/ui.cc:2582
 msgid "^Prev"
 msgstr "上一個(^P)"
 
-#: src/ui.cc:2581
+#: src/ui.cc:2583
 msgid "View previous display"
 msgstr "查看上一畫�"
 
-#: src/ui.cc:2584
+#: src/ui.cc:2586
 msgid "^Close"
 msgstr "關閉(^C)"
 
-#: src/ui.cc:2585
+#: src/ui.cc:2587
 msgid "Close this display"
 msgstr "關閉此畫�"
 
-#: src/ui.cc:2590
+#: src/ui.cc:2592
 msgid "New Package ^View"
 msgstr "新套件視野(^V)"
 
-#: src/ui.cc:2591
+#: src/ui.cc:2593
 msgid "Create a new default package view"
 msgstr "建立新的�設套件視野"
 
-#: src/ui.cc:2594
+#: src/ui.cc:2596
 msgid "Audit ^Recommendations"
 msgstr "檢查推薦�果(^R)"
 
-#: src/ui.cc:2595
+#: src/ui.cc:2597
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr "查看推薦您安�，但是�在尚未安�的套件。"
 
-#: src/ui.cc:2598
+#: src/ui.cc:2600
 msgid "New ^Flat Package List"
 msgstr "新套件視野(^V)"
 
-#: src/ui.cc:2599
+#: src/ui.cc:2601
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr "在一個未分類的列表中查看系統中的所有的套件"
 
-#: src/ui.cc:2602
+#: src/ui.cc:2604
 msgid "New ^Debtags Browser"
 msgstr "新型 Debtags �覽器(^D)"
 
-#: src/ui.cc:2604
+#: src/ui.cc:2606
 msgid "Browse packages using Debtags data"
 msgstr "用 Debtags 的資料來�覽套件"
 
-#: src/ui.cc:2607
+#: src/ui.cc:2609
 msgid "New Categorical ^Browser"
 msgstr "新分類�覽器(^B)"
 
-#: src/ui.cc:2609
+#: src/ui.cc:2611
 msgid "Browse packages by category"
 msgstr "分類�覽套件"
 
-#: src/ui.cc:2617
+#: src/ui.cc:2619
 msgid "^About"
 msgstr "關於(^A)"
 
-#: src/ui.cc:2618
+#: src/ui.cc:2620
 msgid "View information about this program"
 msgstr "查看關於此程�的資訊"
 
-#: src/ui.cc:2621
+#: src/ui.cc:2623
 msgid "^Help"
 msgstr "求助(^H)"
 
-#: src/ui.cc:2622
+#: src/ui.cc:2624
 msgid "View the on-line help"
 msgstr "查看線上求助"
 
-#: src/ui.cc:2624
+#: src/ui.cc:2626
 msgid "User's ^Manual"
 msgstr "用戶手冊(^M)"
 
-#: src/ui.cc:2625
+#: src/ui.cc:2627
 msgid "View the detailed program manual"
 msgstr "�覽詳細的使用手冊"
 
-#: src/ui.cc:2628
+#: src/ui.cc:2630
 msgid "^FAQ"
 msgstr "常見�題(^F)"
 
-#: src/ui.cc:2632
+#: src/ui.cc:2634
 msgid "^News"
 msgstr "新�(^N)"
 
-#: src/ui.cc:2633
+#: src/ui.cc:2635
 msgid "View the important changes made in each version of "
 msgstr "查看�一版本中所�的�大修改"
 
-#: src/ui.cc:2636
+#: src/ui.cc:2638
 msgid "^License"
 msgstr "^授權�款"
 
-#: src/ui.cc:2780
+#: src/ui.cc:2782
 msgid "Actions"
 msgstr "動作"
 
-#: src/ui.cc:2784
+#: src/ui.cc:2786
 msgid "Search"
 msgstr "�尋"
 
-#: src/ui.cc:2785
+#: src/ui.cc:2787
 msgid "Options"
 msgstr "�項"
 
-#: src/ui.cc:2786
+#: src/ui.cc:2788
 msgid "Views"
 msgstr "查看"
 
-#: src/ui.cc:2852
+#: src/ui.cc:2854
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr "%ls：�單  %ls：幫助  %ls：退出  %ls：更新  %ls：下載/安�/移除套件"
 
-#: src/ui.cc:3211
+#: src/ui.cc:3213
 msgid "yes_key"
 msgstr "y"
 
-#: src/ui.cc:3212
+#: src/ui.cc:3214
 msgid "no_key"
 msgstr "n"
 
@@ -7677,9 +7635,47 @@ msgstr "用於下載變更日誌的 URL"
 msgid "Downloading the changelog of %s"
 msgstr "正在下載更改紀錄"
 
-#: src/view_changelog.cc:415
-msgid "You can only view changelogs of official Debian packages."
-msgstr "您�能閱讀官方 Debian 套件的更改紀錄。"
+#~ msgid "MISSING TAG"
+#~ msgstr "缺少標簽"
+
+#~ msgid "URL to use to download changelogs"
+#~ msgstr "用於下載變更日誌的 URL"
+
+#~ msgid ""
+#~ "This option controls the template that's used to download changelogs from "
+#~ "the Debian Web site.  You should only need to change this if the "
+#~ "changelogs move to a different URL."
+#~ msgstr ""
+#~ "該�項控制著從 Debian 官網下載更新記錄的樣�格�。如果更新記錄變更網路連�"
+#~ "時，您必須修改該項目。"
+
+#~ msgid "%s is not an official Debian package, cannot display its changelog."
+#~ msgstr "%s �是官方 Debian 套件，無法顯示更改紀錄"
+
+#~ msgid "Can't find a package named \"%s\""
+#~ msgstr "無法找到任何套件的�稱 \"%s\""
+
+#~ msgid "Unable to parse pattern %s"
+#~ msgstr "無法分�模� %s"
+
+#~ msgid "Expected a number after -q=\n"
+#~ msgstr "在 -q= 之後需�一個數字\n"
+
+#~ msgid "Expected a number after -q=, got %s\n"
+#~ msgstr "在 -q= 之後需�一個數字，但�得到 %s\n"
+
+#~ msgid "-o requires an argument of the form key=value, got %s\n"
+#~ msgstr "-o 需�如key=value格�的�數，�得到%s\n"
+
+#~ msgid "WEIRDNESS: unknown option code received\n"
+#~ msgstr "詭異：收到未知的�項代碼\n"
+
+#, fuzzy
+#~ msgid "-u, -i, and --clean-on-startup may not be specified with a command"
+#~ msgstr "�項 -u 和 -i �能在和一個命令一起指定 "
+
+#~ msgid "You can only view changelogs of official Debian packages."
+#~ msgstr "您�能閱讀官方 Debian 套件的更改紀錄。"
 
 #~ msgid "Err "
 #~ msgstr "錯誤 "
@@ -7845,11 +7841,6 @@ msgstr "您�能閱讀官方 Debian 套件的更改紀錄。"
 #~ msgstr "正在下載更改紀錄"
 
 #, fuzzy
-#~| msgid "No resolution found."
-#~ msgid "No changelog found."
-#~ msgstr "未發�任何解決方案。"
-
-#, fuzzy
 #~| msgid "Cannot open package hierarchy file %s"
 #~ msgid "Can't create a temporary file: %s"
 #~ msgstr "無法打開套件層次檔案 %s"
diff --git a/src/Makefile.in b/src/Makefile.in
index 8e1c9ad5..f34741ac 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -254,6 +254,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/apt_options.cc b/src/apt_options.cc
index bfeeda5f..4f9c3ca6 100644
--- a/src/apt_options.cc
+++ b/src/apt_options.cc
@@ -290,13 +290,6 @@ option_item misc_options[]={
 		 "cache any package files that can no longer be "
 		 "downloaded from any archive in sources.list."),
 	      PACKAGE "::AutoClean-After-Update", false),
-  option_item(N_("URL to use to download changelogs"),
-	      N_("This option controls the template that's used to "
-		 "download changelogs from the Debian Web site.  You "
-		 "should only need to change this if the changelogs move "
-		 "to a different URL."),
-	      PACKAGE "::Changelog-URL-Template",
-	      "http://cgi.debian.org/cgi-bin/get-changelog?package=%s"),
   option_item(N_("Display a preview of what will be done before doing it"),
 	      N_("If this option is enabled, then when you ask "
 		 "aptitude to perform an install run, it will "
diff --git a/src/cmdline/Makefile.in b/src/cmdline/Makefile.in
index 4fc3c2e6..384f5066 100644
--- a/src/cmdline/Makefile.in
+++ b/src/cmdline/Makefile.in
@@ -247,6 +247,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/cmdline/cmdline_action.cc b/src/cmdline/cmdline_action.cc
index a499d19a..9f42e421 100644
--- a/src/cmdline/cmdline_action.cc
+++ b/src/cmdline/cmdline_action.cc
@@ -220,7 +220,7 @@ namespace
 
 bool cmdline_applyaction(cmdline_pkgaction_type action,
 			 pkgCache::PkgIterator pkg,
-			 std::set<pkgCache::PkgIterator> &seen_virtual_packages,
+			 pkgset &seen_virtual_packages,
 			 pkgset &to_install, pkgset &to_hold,
 			 pkgset &to_remove, pkgset &to_purge,
 			 int verbose,
@@ -232,79 +232,99 @@ bool cmdline_applyaction(cmdline_pkgaction_type action,
                          const shared_ptr<terminal_metrics> &term_metrics)
 {
   // Handle virtual packages.
-  if(!pkg.ProvidesList().end())
+  if(!pkg.ProvidesList().end() && pkg.VersionList().end())
     {
-      if(pkg.VersionList().end())
-	{
-	  const bool seen_in_first_pass =
-	    seen_virtual_packages.find(pkg) != seen_virtual_packages.end();
-
-	  if(!seen_in_first_pass)
-	    {
-	      for(pkgCache::PrvIterator prv=pkg.ProvidesList(); !prv.end(); ++prv)
-		{
-		  if(prv.OwnerPkg().CurrentVer()==prv.OwnerVer())
-		    {
-		      if(verbose>0)
-			printf(_("Note: \"%s\", providing the virtual package\n      \"%s\", is already installed.\n"),
-			       prv.OwnerPkg().FullName(true).c_str(), pkg.Name());
-		      return true;
-		    }
-		  else if((*apt_cache_file)[prv.OwnerPkg()].InstVerIter(*apt_cache_file)==prv.OwnerVer())
-		    {
-		      if(verbose>0)
-			printf(_("Note: \"%s\", providing the virtual package\n      \"%s\", is already going to be installed.\n"),
-			       prv.OwnerPkg().FullName(true).c_str(), pkg.Name());
-		      return true;
-		    }
-		}
-	    }
-
-	  seen_virtual_packages.insert(pkg);
-
-	  // See if there's only one possible package to install.
-	  pkgvector cands;
-
-	  for(pkgCache::PrvIterator prv=pkg.ProvidesList();
-	      !prv.end(); ++prv)
-	    {
-	      if((*apt_cache_file)[prv.OwnerPkg()].CandidateVerIter(*apt_cache_file)==prv.OwnerVer())
-		cands.push_back(prv.OwnerPkg());
-	    }
-
-	  if(cands.size()==0)
-	    {
-	      if(!seen_in_first_pass)
-		printf(_("\"%s\" exists in the package database, but it is not a\nreal package and no package provides it.\n"),
-		     pkg.Name());
-	      return false;
-	    }
-	  else if(cands.size()>1)
-	    {
-	      if(!seen_in_first_pass)
-		{
-		  printf(_("\"%s\" is a virtual package provided by:\n"),
-			 pkg.Name());
-		  cmdline_show_pkglist(cands, term_metrics);
-		  printf(_("You must choose one to install.\n"));
-		}
-	      return false;
-	    }
-	  else if(cands.size()==1)
-	    {
-	      if(!seen_in_first_pass)
-		{
-		  printf(_("Note: selecting \"%s\" instead of the\n      virtual package \"%s\"\n"),
-			 cands[0].FullName(true).c_str(), pkg.Name());
-		}
-	      pkg = cands[0];
-	    }
- 	}
+      const bool seen_in_first_pass =
+        seen_virtual_packages.find(pkg) != seen_virtual_packages.end();
+
+      if(!seen_in_first_pass)
+        {
+          switch(action)
+            {
+            case cmdline_install:
+            case cmdline_installauto:
+              for(pkgCache::PrvIterator prv=pkg.ProvidesList();
+                  prv.end() == false;
+                  ++prv)
+                {
+                  if(prv.OwnerPkg().CurrentVer() == prv.OwnerVer())
+                    {
+                      if(verbose > 0)
+                        printf(_("Note: \"%s\", providing the virtual package\n"
+                                 "      \"%s\", is already installed.\n"),
+                               prv.OwnerPkg().FullName(true).c_str(),
+                               pkg.FullName(true).c_str());
+                      return true;
+                    }
+                  else if((*apt_cache_file)[prv.OwnerPkg()].InstVerIter(*apt_cache_file)==prv.OwnerVer())
+                    {
+                      if(verbose > 0)
+                        printf(_("Note: \"%s\", providing the virtual package\n"
+                                 "      \"%s\", is already going to be installed.\n"),
+			       prv.OwnerPkg().FullName(true).c_str(),
+                               pkg.FullName(true).c_str());
+                      return true;
+                    }
+                }
+              break;
+            default:
+              break;
+            }
+        }
+
+      seen_virtual_packages.insert(pkg);
+
+      // See if there's only one possible package to install.
+      pkgvector cands;
+
+      for(pkgCache::PrvIterator prv=pkg.ProvidesList();
+          !prv.end(); ++prv)
+        {
+          if((*apt_cache_file)[prv.OwnerPkg()].CandidateVerIter(*apt_cache_file)==prv.OwnerVer())
+            cands.push_back(prv.OwnerPkg());
+        }
+
+      if(cands.size()==0)
+        {
+          if(!seen_in_first_pass)
+            printf(_("\"%s\" exists in the package database, but it is not a\n"
+                     "real package and no package provides it.\n"),
+                   pkg.FullName(true).c_str());
+          return false;
+        }
+      else if(cands.size()>1)
+        {
+          if(!seen_in_first_pass)
+            {
+              printf(_("\"%s\" is a virtual package provided by:\n"),
+                     pkg.FullName(true).c_str());
+              cmdline_show_pkglist(cands, term_metrics);
+              printf(_("You must choose one to install.\n"));
+              printf("\n");
+              _error->Error(_("Package '%s' has no installation candidate"),
+                            pkg.FullName(true).c_str());
+            }
+          return false;
+        }
+      else if(cands.size()==1)
+        {
+          if(!seen_in_first_pass)
+            {
+              printf(_("Note: selecting \"%s\" instead of the\n"
+                       "      virtual package \"%s\"\n"),
+                     cands[0].FullName(true).c_str(), pkg.Name());
+            }
+          pkg = cands[0];
+        }
     }
 
   pkgCache::VerIterator ver=pkg.CurrentVer();
   if(action==cmdline_install || action == cmdline_installauto)
-    ver=cmdline_find_ver(pkg, source, sourcestr);
+    {
+      ver=cmdline_find_ver(pkg, source, sourcestr);
+      if(ver.end() == true)
+        return false;
+    }
 
   pkgDepCache::StateCache &pkg_state((*apt_cache_file)[pkg]);
 
@@ -472,161 +492,117 @@ bool cmdline_applyaction(string s,
   if(!cmdline_parse_source(s, source, package, sourcestr))
     return false;
 
-  // Handle task installation.  Won't work if tasksel isn't installed.
-  aptitude::apt::task task;
-  string arch;
-  if(cmdline_parse_task(package, task, arch) == true)
-  {
-    printf(_("Note: selecting the task \"%s: %s\" for installation\n"),
-           task.name.c_str(), cw::util::transcode(task.shortdesc).c_str());
-
-    pkgset pkgset;
-    aptitude::apt::get_task_packages(&pkgset, task, arch);
-    for(pkgset::iterator pkg = pkgset.begin();
-        pkg != pkgset.end();
-        ++pkg)
-      {
-        rval = cmdline_applyaction(action, *pkg,
-                                   seen_virtual_packages,
-                                   to_install, to_hold, to_remove, to_purge,
-                                   verbose, source,
-                                   sourcestr,
-                                   policy, arch_only,
-                                   allow_auto,
-                                   term_metrics) && rval;
-      }
-
-    // break out.
-    return rval;
-  }
-
   // This is harmless for other commands, but it won't make sense.
   if(source == cmdline_version_version &&
      action != cmdline_install &&
      action != cmdline_forbid_version &&
      action != cmdline_installauto &&
      action != cmdline_build_depends)
-    {
-      printf(_("You can only specify a package version with an 'install' command or a 'forbid-version' command.\n"));
-      return false;
-    }
+    return _error->Error(_("You can only specify a package version with an"
+                           " 'install' command or a 'forbid-version' command"));
 
   if(source == cmdline_version_archive &&
      action != cmdline_install &&
      action != cmdline_installauto &&
      action != cmdline_build_depends)
-    {
-      printf(_("You can only specify a package archive with an 'install' command.\n"));
-      return false;
-    }
+    return _error->Error(_("You can only specify a package archive with an"
+                           " 'install' command"));
 
-  if(!aptitude::matching::is_pattern(package))
+  pkgset pkgset;
+  if(aptitude::cmdline::pkgset_from_string(&pkgset, package,
+                                           GlobalError::ERROR,
+                                           GlobalError::WARNING) == false)
     {
-      pkgCache::PkgIterator pkg=(*apt_cache_file)->FindPkg(package.c_str());
-      if(pkg.end())
-	{
-	  // Assume the user asked for a source package.
-	  if(action == cmdline_build_depends)
-	    return cmdline_do_build_depends(package,
-					    seen_virtual_packages,
-					    source,
-					    sourcestr,
-					    arch_only,
-					    policy,
-					    to_install, to_hold,
-					    to_remove, to_purge,
-					    verbose,
-					    allow_auto,
-                                            term_metrics);
-
-	  // Maybe they misspelled the package name?
-	  pkgvector possible;
-
-	  for(pkgCache::PkgIterator j=(*apt_cache_file)->PkgBegin();
-	      !j.end(); ++j)
-	    {
-	      if(!(j.VersionList().end() && j.ProvidesList().end()) &&
-		 strstr(j.Name(), package.c_str()) != NULL)
-		possible.push_back(j);
-	    }
-
-	  if(!possible.empty())
-	    {
-	      // Don't overwhelm the user.
-	      if(possible.size()>40)
-		printf(_("Couldn't find package \"%s\", and more than 40\npackages contain \"%s\" in their name.\n"), package.c_str(), package.c_str());
-	      else
-		{
-		  printf(_("Couldn't find package \"%s\".  However, the following\npackages contain \"%s\" in their name:\n"), package.c_str(), package.c_str());
-		  cmdline_show_pkglist(possible, term_metrics);
-		}
-	    }
-	  else
-	    {
-	      for(pkgCache::PkgIterator j=(*apt_cache_file)->PkgBegin();
-		  !j.end(); ++j)
-		{
-		  for(pkgCache::VerIterator v = j.VersionList();
-		      !v.end(); ++v)
-		    {
-		      std::wstring desc = get_long_description(v, apt_package_records);
-		      if(desc.find(cw::util::transcode(package)) != desc.npos)
-			{
-			  possible.push_back(j);
-			  break;
-			}
-		    }
-		}
-
-	      if(possible.empty())
-		printf(_("Couldn't find any package whose name or description matched \"%s\"\n"), package.c_str());
-	      else if(possible.size()>40)
-		printf(_("Couldn't find any package matching \"%s\", and more than 40\npackages contain \"%s\" in their description.\n"), package.c_str(), package.c_str());
-	      else
-		{
-		  printf(_("Couldn't find any package matching \"%s\".  However, the following\npackages contain \"%s\" in their description:\n"), package.c_str(), package.c_str());
-		  cmdline_show_pkglist(possible, term_metrics);
-		}
-	    }
-
-	  return false;
-	}
+      // pkgset_from_string generates a warning for patterns with no
+      // matches.
+      if(is_pattern(package) == true)
+        return false;
+
+      // Assume the user asked for a source package.
+      if(action == cmdline_build_depends)
+        return cmdline_do_build_depends(package,
+                                        seen_virtual_packages,
+                                        source,
+                                        sourcestr,
+                                        arch_only,
+                                        policy,
+                                        to_install, to_hold,
+                                        to_remove, to_purge,
+                                        verbose,
+                                        allow_auto,
+                                        term_metrics);
+
+      // Maybe they misspelled the package name?
+      pkgvector possible;
+
+      for(pkgCache::PkgIterator j=(*apt_cache_file)->PkgBegin();
+          !j.end(); ++j)
+        {
+          if(!(j.VersionList().end() && j.ProvidesList().end()) &&
+             strstr(j.Name(), package.c_str()) != NULL)
+            possible.push_back(j);
+        }
+
+      if(!possible.empty())
+        {
+          // Don't overwhelm the user.
+          if(possible.size()>40)
+            printf(_("Couldn't find package \"%s\", and more than 40\n"
+                     "packages contain \"%s\" in their name.\n"),
+                   package.c_str(), package.c_str());
+          else
+            {
+              printf(_("Couldn't find package \"%s\".  However, the following\n"
+                       "packages contain \"%s\" in their name:\n"),
+                     package.c_str(), package.c_str());
+              cmdline_show_pkglist(possible, term_metrics);
+            }
+        }
+      else
+        {
+          for(pkgCache::PkgIterator j=(*apt_cache_file)->PkgBegin();
+              !j.end(); ++j)
+            {
+              for(pkgCache::VerIterator v = j.VersionList();
+                  !v.end(); ++v)
+                {
+                  std::wstring desc = get_long_description(v, apt_package_records);
+                  if(desc.find(cw::util::transcode(package)) != desc.npos)
+                    {
+                      possible.push_back(j);
+                      break;
+                    }
+                }
+            }
+
+          if(possible.empty())
+            printf(_("Couldn't find any package whose name or description matched \"%s\"\n"),
+                   package.c_str());
+          else if(possible.size()>40)
+            printf(_("Couldn't find any package matching \"%s\", and more than 40\n"
+                     "packages contain \"%s\" in their description.\n"),
+                   package.c_str(), package.c_str());
+          else
+            {
+              printf(_("Couldn't find any package matching \"%s\".  However, the following\n"
+                       "packages contain \"%s\" in their description:\n"),
+                     package.c_str(), package.c_str());
+              cmdline_show_pkglist(possible, term_metrics);
+            }
+        }
 
-      rval = cmdline_applyaction(action, pkg,
-				 seen_virtual_packages,
-				 to_install, to_hold, to_remove, to_purge,
-				 verbose, source,
-				 sourcestr, policy, arch_only, allow_auto,
-                                 term_metrics);
+      return false;
     }
-  else
-    {
-      cw::util::ref_ptr<pattern> p(parse(package.c_str()));
-      if(!p.valid())
-	{
-	  _error->DumpErrors();
-	  return false;
-	}
 
-      std::vector<std::pair<pkgCache::PkgIterator, cw::util::ref_ptr<structural_match> > > matches;
-      cw::util::ref_ptr<search_cache> search_info(search_cache::create());
-      search(p, search_info, matches,
-	     *apt_cache_file,
-	     *apt_package_records);
-      for(std::vector<std::pair<pkgCache::PkgIterator, cw::util::ref_ptr<structural_match> > >::const_iterator
-	    it = matches.begin(); it != matches.end(); ++it)
-	{
-	  if(!cmdline_applyaction(action, it->first,
-				  seen_virtual_packages,
-				  to_install, to_hold, to_remove, to_purge,
-				  verbose, source,
-				  sourcestr,
-				  policy, arch_only,
-				  allow_auto,
-                                  term_metrics))
-	    rval = false;
-	}
-    }
+  for(pkgset::const_iterator it = pkgset.begin();
+      it != pkgset.end();
+      ++it)
+    rval &= cmdline_applyaction(action, *it,
+                                seen_virtual_packages,
+                                to_install, to_hold, to_remove, to_purge,
+                                verbose, source,
+                                sourcestr, policy, arch_only, allow_auto,
+                                term_metrics);
 
   return rval;
 }
diff --git a/src/cmdline/cmdline_action.h b/src/cmdline/cmdline_action.h
index 37510d31..663dd05a 100644
--- a/src/cmdline/cmdline_action.h
+++ b/src/cmdline/cmdline_action.h
@@ -102,7 +102,7 @@ namespace aptitude
  */
 bool cmdline_applyaction(cmdline_pkgaction_type action,
 			 pkgCache::PkgIterator pkg,
-			 std::set<pkgCache::PkgIterator> &seen_virtual_packages,
+			 pkgset &seen_virtual_packages,
 			 pkgset &to_install, pkgset &to_hold,
 			 pkgset &to_remove, pkgset &to_purge,
 			 int verbose,
diff --git a/src/cmdline/cmdline_changelog.cc b/src/cmdline/cmdline_changelog.cc
index 17c79fca..370301af 100644
--- a/src/cmdline/cmdline_changelog.cc
+++ b/src/cmdline/cmdline_changelog.cc
@@ -177,7 +177,6 @@ void set_name(temp::name n, temp::name *target)
       single_download_progress::failure(msg);
 
       _error->Error(_("Changelog download failed: %s"), msg.c_str());
-      _error->DumpErrors();
 
       out_changelog_file = temp::name();
       aptitude::cmdline::exit_main();
@@ -231,7 +230,7 @@ void set_name(temp::name n, temp::name *target)
                                                                    term_metrics);
 
     boost::shared_ptr<aptitude::apt::changelog_info>
-      info = aptitude::apt::changelog_info::create(srcpkg, ver, section, name);
+      info = aptitude::apt::changelog_info::guess(srcpkg, ver, section, name);
 
     get_changelog(info,
 		  callbacks,
@@ -288,30 +287,21 @@ void do_cmdline_changelog(const vector<string> &packages,
 	pager="more";
     }
 
-  string default_release = aptcfg->Find("APT::Default-Release");
-
+  _error->PushToStack();
   for(vector<string>::const_iterator i=packages.begin(); i!=packages.end(); ++i)
     {
       // We need to do this because some code (see above) checks
-      // PendingError to see whether everything is OK.  In addition,
-      // dumping errors means we get sensible error message output
-      // (this will be true even if the PendingError check is removed
-      // ... which it arguably should be).
-      _error->DumpErrors();
+      // PendingError to see whether everything is OK.
+      _error->MergeWithStack();
+      _error->PushToStack();
       string input=*i;
 
-      cmdline_version_source source;
+      cmdline_version_source source = cmdline_version_cand;
       string package, sourcestr;
 
       if(!cmdline_parse_source(input, source, package, sourcestr))
 	continue;
 
-      if(source == cmdline_version_cand && !default_release.empty())
-	{
-	  source    = cmdline_version_archive;
-	  sourcestr = default_release;
-	}
-
       pkgCache::PkgIterator pkg=(*apt_cache_file)->FindPkg(package);
 
       temp::name filename;
@@ -326,54 +316,7 @@ void do_cmdline_changelog(const vector<string> &packages,
 
 	  if(!ver.end())
 	    {
-	      // Move this to a central location and just display an
-	      // apt error?
-	      bool in_debian=false;
-
-	      for(pkgCache::VerFileIterator vf=ver.FileList();
-		  !vf.end() && !in_debian; ++vf)
-		if(!vf.File().end() && vf.File().Origin()!=NULL &&
-		   strcmp(vf.File().Origin(), "Debian")==0)
-		  in_debian=true;
-
-	      if(!in_debian)
-		{
-		  _error->Error(_("%s is not an official Debian package, cannot display its changelog."), input.c_str());
-		  continue;
-		}
-	    }
-
-	  aptitude::cmdline::source_package p =
-	    aptitude::cmdline::find_source_package(package,
-						   source,
-						   sourcestr);
-
-	  // Use the source package if one was found; otherwise try to
-	  // use an explicit version.
-	  if(p.valid())
-	    {
-	      get_changelog_from_source(p.get_package(),
-					p.get_version(),
-					p.get_section(),
-					pkg.Name(),
-					filename,
-                                        term_metrics);
-	    }
-	  else
-	    {
-	      // Fall back to string-based guessing if the version is
-	      // invalid.
-	      if(ver.end())
-                {
-                  if(source == cmdline_version_version)
-                    filename = changelog_by_version(package, sourcestr, term_metrics);
-                  // If we don't even have a version string, leave
-                  // filename blank; we'll fail below.
-                }
-	      else
-		{
-		  get_changelog(ver, filename, term_metrics);
-		}
+              get_changelog(ver, filename, term_metrics);
 	    }
 	}
       else
@@ -392,33 +335,6 @@ void do_cmdline_changelog(const vector<string> &packages,
 					filename,
                                         term_metrics);
 	    }
-	  else
-	    {
-	      // We couldn't find a real or source package with the
-	      // given name and version.
-	      //
-	      // If the user didn't specify a version or selected a
-	      // candidate and we couldn't find anything, we have no
-	      // recourse.  But if they passed a version number, we
-	      // can fall back to just blindly guessing that the
-	      // version exists.
-
-	      switch(source)
-		{
-		case cmdline_version_cand:
-		  break;
-
-		case cmdline_version_curr_or_cand:
-		  break;
-
-		case cmdline_version_archive:
-		  break;
-
-		case cmdline_version_version:
-		  filename = changelog_by_version(package, sourcestr, term_metrics);
-		  break;
-		}
-	    }
 	}
 
       if(!filename.valid())
@@ -429,7 +345,7 @@ void do_cmdline_changelog(const vector<string> &packages,
           _error->Error(_("Couldn't run pager %s"), pager);
     }
 
-  _error->DumpErrors();
+  _error->MergeWithStack();
 }
 
 // TODO: fetch them all in one go.
@@ -437,16 +353,13 @@ int cmdline_changelog(int argc, char *argv[])
 {
   shared_ptr<terminal_io> term = create_terminal();
 
-  _error->DumpErrors();
+  consume_errors();
 
   OpProgress progress;
   apt_init(&progress, false);
 
   if(_error->PendingError())
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   vector<string> packages;
   for(int i=1; i<argc; ++i)
@@ -454,7 +367,5 @@ int cmdline_changelog(int argc, char *argv[])
 
   do_cmdline_changelog(packages, term);
 
-  _error->DumpErrors();
-
-  return 0;
+  return _error->PendingError() ? 100 : 0;
 }
diff --git a/src/cmdline/cmdline_changelog.h b/src/cmdline/cmdline_changelog.h
index 580b8fb4..2be98d5f 100644
--- a/src/cmdline/cmdline_changelog.h
+++ b/src/cmdline/cmdline_changelog.h
@@ -40,7 +40,7 @@ namespace aptitude
 /** \brief Display the changelog of each of the given package specifiers.
  *
  *  The specifiers are literal package names, with optional version/archive
- *  descriptors.  DumpErrors() is called after each changelog is displayed.
+ *  descriptors.
  */
 void do_cmdline_changelog(const std::vector<std::string> &packages,
                           const boost::shared_ptr<aptitude::cmdline::terminal_metrics> &term_metrics);
diff --git a/src/cmdline/cmdline_check_resolver.cc b/src/cmdline/cmdline_check_resolver.cc
index cc112c0e..01077801 100644
--- a/src/cmdline/cmdline_check_resolver.cc
+++ b/src/cmdline/cmdline_check_resolver.cc
@@ -157,17 +157,14 @@ namespace
 int cmdline_check_resolver(int argc, char *argv[],
 			  const char *status_fname)
 {
-  _error->DumpErrors();
+  consume_errors();
 
   OpProgress progress;
 
   apt_init(&progress, true, status_fname);
 
   if(_error->PendingError())
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   aptitude_universe u(*apt_cache_file);
 
diff --git a/src/cmdline/cmdline_clean.cc b/src/cmdline/cmdline_clean.cc
index 3a9670f7..7037b560 100644
--- a/src/cmdline/cmdline_clean.cc
+++ b/src/cmdline/cmdline_clean.cc
@@ -53,12 +53,12 @@ int cmdline_clean(int argc, char *argv[], bool simulate)
 {
   const string archivedir = aptcfg->FindDir("Dir::Cache::archives");
 
-  _error->DumpErrors();
+  consume_errors();
 
   if(argc != 1)
     {
-      fprintf(stderr, _("E: The clean command takes no arguments\n"));
-      return -1;
+      _error->Error(_("The clean command takes no arguments"));
+      return 100;
     }  
 
   if(simulate)
@@ -77,20 +77,13 @@ int cmdline_clean(int argc, char *argv[], bool simulate)
     }
 
   if(_error->PendingError())
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   pkgAcquire fetcher;
   fetcher.Clean(archivedir);
   fetcher.Clean(archivedir+"partial/");
 
-  int rval=_error->PendingError() ? -1 : 0;
-
-  _error->DumpErrors();
-
-  return rval;
+  return _error->PendingError() ? 100 : 0;
 }
 
 // Shamelessly stolen from apt-get:
@@ -127,12 +120,12 @@ int cmdline_autoclean(int argc, char *argv[], bool simulate)
   const string archivedir = aptcfg->FindDir("Dir::Cache::archives");
   const shared_ptr<terminal_io> term = create_terminal();
 
-  _error->DumpErrors();
+  consume_errors();
 
   if(argc != 1)
     {
-      fprintf(stderr, _("E: The autoclean command takes no arguments\n"));
-      return -1;
+      _error->Error(_("The autoclean command takes no arguments"));
+      return 100;
     }  
 
   // Lock the archive directory
@@ -144,8 +137,7 @@ int cmdline_autoclean(int argc, char *argv[], bool simulate)
       if (_error->PendingError() == true)
         {
           _error->Error(_("Unable to lock the download directory"));
-          _error->DumpErrors();
-          return -1;
+          return 100;
         }
     }
 
@@ -154,19 +146,14 @@ int cmdline_autoclean(int argc, char *argv[], bool simulate)
   apt_init(progress.get(), false);
 
   if(_error->PendingError())
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   LogCleaner cleaner(simulate);
   int rval=0;
   if(!(cleaner.Go(archivedir, *apt_cache_file) &&
        cleaner.Go(archivedir+"partial/", *apt_cache_file)) ||
      _error->PendingError())
-    rval=-1;
-
-  _error->DumpErrors();
+    rval = 100;
 
   if(simulate)
     printf(_("Would free %sB of disk space\n"),
@@ -177,4 +164,3 @@ int cmdline_autoclean(int argc, char *argv[], bool simulate)
 
   return rval;
 }
-
diff --git a/src/cmdline/cmdline_do_action.cc b/src/cmdline/cmdline_do_action.cc
index 8d088379..a7b2ce3f 100644
--- a/src/cmdline/cmdline_do_action.cc
+++ b/src/cmdline/cmdline_do_action.cc
@@ -1,6 +1,7 @@
 // cmdline_do_action.cc
 //
 //  Copyright (C) 2004, 2010 Daniel Burrows
+//  Copyright (C) 2012 Daniel Hartwig
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -101,7 +102,7 @@ int cmdline_do_action(int argc, char *argv[],
 {
   shared_ptr<terminal_io> term = create_terminal();
 
-  _error->DumpErrors();
+  consume_errors();
 
   cmdline_pkgaction_type default_action=cmdline_install;
 
@@ -157,8 +158,7 @@ int cmdline_do_action(int argc, char *argv[],
     {
       // Should never happen.
       _error->Error(_("Invalid operation %s"), argv[0]);
-      _error->DumpErrors();
-      return -1;
+      return 100;
     }
 
   if(resolver_mode == resolver_mode_default)
@@ -178,10 +178,7 @@ int cmdline_do_action(int argc, char *argv[],
             upgrade_mode == no_upgrade), status_fname);
 
   if(_error->PendingError())
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   // In case we aren't root.
   if(!simulate)
@@ -190,10 +187,7 @@ int cmdline_do_action(int argc, char *argv[],
     apt_cache_file->ReleaseLock();
 
   if(_error->PendingError())
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   pkgPolicy policy(&(*apt_cache_file)->GetCache());
   ReadPinFile(policy);
@@ -230,8 +224,8 @@ int cmdline_do_action(int argc, char *argv[],
     {
       if(argc != 1)
 	{
-	  cerr << _("Unexpected pattern argument following \"keep-all\"") << endl;
-	  return -1;
+          _error->Error(_("Unexpected pattern argument following \"keep-all\""));
+          return 100;
 	}
 
       for(pkgCache::PkgIterator i=(*apt_cache_file)->PkgBegin();
@@ -334,6 +328,9 @@ int cmdline_do_action(int argc, char *argv[],
     }
   }
 
+  if(_error->PendingError() == true)
+    return 100;
+
   if(resolver_mode == resolver_mode_safe)
     {
       if(!aptitude::cmdline::safe_resolve_deps(verbose,
@@ -342,8 +339,9 @@ int cmdline_do_action(int argc, char *argv[],
                                                safe_resolver_show_actions,
                                                term))
 	{
-	  fprintf(stderr, _("Unable to safely resolve dependencies, try running with --full-resolver.\n"));
-	  return -1;
+          _error->Error(_("Unable to safely resolve dependencies, try"
+                          " running with --full-resolver"));
+          return 100;
 	}
     }
 
@@ -366,10 +364,7 @@ int cmdline_do_action(int argc, char *argv[],
       aptitude::cmdline::apply_user_tags(user_tags);
 
       if(!(*apt_cache_file)->save_selection_list(*progress))
-	{
-	  _error->DumpErrors();
-	  return -1;
-	}
+        return 100;
       else
 	return 0;
     }
@@ -389,16 +384,21 @@ int cmdline_do_action(int argc, char *argv[],
       aptitude::cmdline::apply_user_tags(user_tags);
 
       download_install_manager m(download_only,
+                                 aptcfg->FindB(PACKAGE "::CmdLine::Fix-Missing", false),
 				 sigc::ptr_fun(&run_dpkg_directly));
 
+      // FIXME: Temporary work-around for bug #677175 in apt.
+      const size_t prev_err_stack_count = _error->StackCount();
+
       int rval =
 	(cmdline_do_download(&m, verbose, term, term, term, term)
-         == download_manager::success ? 0 : -1);
+         == download_manager::success ? 0 : 100);
 
-      if(_error->PendingError())
-	rval = -1;
+      while(_error->StackCount() > prev_err_stack_count)
+        _error->MergeWithStack();
 
-      _error->DumpErrors();
+      if(_error->PendingError())
+	rval = 100;
 
       return rval;
     }
diff --git a/src/cmdline/cmdline_download.cc b/src/cmdline/cmdline_download.cc
index 655d6337..4b4044d0 100644
--- a/src/cmdline/cmdline_download.cc
+++ b/src/cmdline/cmdline_download.cc
@@ -42,28 +42,23 @@ int cmdline_download(int argc, char *argv[])
 
   if(argc<=1)
     {
-      printf(_("download: you must specify at least one package to download\n"));
-      return -1;
+      _error->Error(_("download: you must specify at least one package to download"));
+      return 100;
     }
 
-  _error->DumpErrors();
+  consume_errors();
 
   shared_ptr<OpProgress> progress = make_text_progress(false, term, term, term);
   apt_init(progress.get(), false);
 
   if(_error->PendingError())
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   pkgSourceList list;
   if(!list.ReadMainList())
     {
       _error->Error(_("Couldn't read source list"));
-
-      _error->DumpErrors();
-      return -1;
+      return 100;
     }
 
   std::pair<download_signal_log *, boost::shared_ptr<acquire_download_progress> >
@@ -72,63 +67,21 @@ int cmdline_download(int argc, char *argv[])
   pkgAcquire fetcher;
   fetcher.Setup(progress_display.first);
   string filenames[(*apt_cache_file)->Head().PackageCount];
-  string default_release = aptcfg->Find("APT::Default-Release");
 
   for(int i=1; i<argc; ++i)
     {
-      cmdline_version_source source;
+      cmdline_version_source source = cmdline_version_cand;
       string name, sourcestr;
       if(!cmdline_parse_source(argv[i], source, name, sourcestr))
 	continue;
 
-      if(source == cmdline_version_cand && !default_release.empty())
-	{
-	  source = cmdline_version_archive;
-	  sourcestr = default_release;
-	}
-
-      std::vector<pkgCache::PkgIterator> packages;
+      pkgset packages;
+      if(aptitude::cmdline::pkgset_from_string(&packages, name) == false)
+        continue;
 
-      if(!aptitude::matching::is_pattern(name))
-	{
-	  pkgCache::PkgIterator pkg=(*apt_cache_file)->FindPkg(name);
-	  if(pkg.end())
-	    {
-	      _error->Error(_("Can't find a package named \"%s\""), name.c_str());
-	      continue;
-	    }
-
-	  packages.push_back(pkg);
-	}
-      else
-	{
-	  using namespace aptitude::matching;
-	  using cwidget::util::ref_ptr;
-	  ref_ptr<pattern> p(parse(name.c_str()));
-	  if(!p.valid())
-	    {
-	      _error->DumpErrors();
-	      return false;
-	    }
-
-	  std::vector<std::pair<pkgCache::PkgIterator, ref_ptr<structural_match> > > matches;
-	  ref_ptr<search_cache> search_info(search_cache::create());
-	  search(p, search_info,
-		 matches,
-		 *apt_cache_file,
-		 *apt_package_records);
-
-	  for(std::vector<std::pair<pkgCache::PkgIterator, ref_ptr<structural_match> > >::const_iterator
-		it = matches.begin(); it != matches.end(); ++it)
-	    packages.push_back(it->first);
-
-	  // Maybe there should be a warning here if packages is
-	  // empty?  TODO: think about it again when the string freeze
-	  // is lifted post-lenny.
-	}
-
-      for(std::vector<pkgCache::PkgIterator>::const_iterator it =
-	    packages.begin(); it != packages.end(); ++it)
+      for(pkgset::const_iterator it = packages.begin();
+          it != packages.end();
+          ++it)
 	{
 	  const pkgCache::PkgIterator pkg = *it;
 
@@ -138,7 +91,8 @@ int cmdline_download(int argc, char *argv[])
 	    continue;
 
 	  if(!ver.Downloadable())
-	    _error->Error(_("No downloadable files for %s version %s; perhaps it is a local or obsolete package?"),
+            _error->Error(_("No downloadable files for %s version %s;"
+                            " perhaps it is a local or obsolete package?"),
 			  name.c_str(), ver.VerStr());
 
 	  get_archive(&fetcher, &list, apt_package_records,
@@ -148,10 +102,7 @@ int cmdline_download(int argc, char *argv[])
 
   if(fetcher.Run()!=pkgAcquire::Continue)
     // We failed or were cancelled
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   return 0;
 }
diff --git a/src/cmdline/cmdline_dump_resolver.cc b/src/cmdline/cmdline_dump_resolver.cc
index 44f0e2b1..0c4e66ae 100644
--- a/src/cmdline/cmdline_dump_resolver.cc
+++ b/src/cmdline/cmdline_dump_resolver.cc
@@ -31,17 +31,14 @@ using namespace std;
 int cmdline_dump_resolver(int argc, char *argv[],
 			  const char *status_fname)
 {
-  _error->DumpErrors();
+  consume_errors();
 
   OpProgress progress;
 
   apt_init(&progress, true, status_fname);
 
   if(_error->PendingError())
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   aptitude_universe u(*apt_cache_file);
 
diff --git a/src/cmdline/cmdline_extract_cache_subset.cc b/src/cmdline/cmdline_extract_cache_subset.cc
index 2a2a3836..75f4c4fd 100644
--- a/src/cmdline/cmdline_extract_cache_subset.cc
+++ b/src/cmdline/cmdline_extract_cache_subset.cc
@@ -54,8 +54,9 @@ namespace aptitude
     {
       if(argc < 2)
 	{
-	  fprintf(stderr, _("extract-cache-entries: at least one argument is required (the directory\nto which to write files).\n"));
-	  return -1;
+          _error->Error(_("extract-cache-entries: at least one argument is"
+                          " required (the directory to which to write files)"));
+          return 100;
 	}
 
       const shared_ptr<terminal_io> term = create_terminal();
@@ -66,13 +67,9 @@ namespace aptitude
 
       apt_init(progress.get(), true);
       if(_error->PendingError())
-	{
-	  _error->DumpErrors();
-	  return -1;
-	}
+        return 100;
 
-      bool ok = true;
-      std::set<pkgCache::PkgIterator> packages;
+      pkgset packages;
       if(argc == 2)
 	{
 	  for(pkgCache::PkgIterator pIt = (*apt_cache_file)->PkgBegin();
@@ -82,65 +79,22 @@ namespace aptitude
       else
 	{
 	  for(int i = 2; i < argc; ++i)
-	    {
-	      std::string arg(argv[i]);
-
-	      if(!aptitude::matching::is_pattern(arg))
-		{
-		  pkgCache::PkgIterator pIt = (*apt_cache_file)->FindPkg(arg);
-		  if(pIt.end())
-		    {
-                      std::cerr << ssprintf(_("No such package \"%s\""), arg.c_str())
-                                << std::endl;
-		      ok = false;
-		    }
-		  else
-		    packages.insert(pIt);
-		}
-	      else
-		{
-		  using namespace aptitude::matching;
-		  using cwidget::util::ref_ptr;
-
-		  ref_ptr<pattern> p = parse(arg);
-
-		  if(p.valid())
-		    {
-		      _error->DumpErrors();
-		    }
-		  else
-		    {
-		      std::vector<std::pair<pkgCache::PkgIterator, ref_ptr<structural_match> > > matches;
-		      ref_ptr<search_cache> search_info(search_cache::create());
-		      search(p, search_info,
-			     matches,
-			     *apt_cache_file,
-			     *apt_package_records);
-
-		      for(std::vector<std::pair<pkgCache::PkgIterator, ref_ptr<structural_match> > >::const_iterator
-			    it = matches.begin(); it != matches.end(); ++it)
-			packages.insert(it->first);
-		    }
-		}
-	    }
+            pkgset_from_string(&packages, argv[i]);
 	}
 
-      if(!ok)
-	return 2;
+      if(_error->PendingError() == true)
+        return 100;
 
       if(packages.size() == 0)
-	{
-	  printf(_("No packages were selected by the given search pattern; nothing to do.\n"));
-	  return 0;
-	}
+        {
+          printf(_("No packages were selected by the given search pattern;"
+                   " nothing to do.\n"));
+          return 0;
+        }
 
       aptitude::apt::make_truncated_state_copy(out_dir, packages);
 
-      bool copy_ok = !_error->PendingError();
-
-      _error->DumpErrors();
-
-      return copy_ok ? 0 : 1;
+      return _error->PendingError() == true ? 100 : 0;
     }
   }
 }
diff --git a/src/cmdline/cmdline_forget_new.cc b/src/cmdline/cmdline_forget_new.cc
index e1485f52..4d3aadb4 100644
--- a/src/cmdline/cmdline_forget_new.cc
+++ b/src/cmdline/cmdline_forget_new.cc
@@ -47,14 +47,14 @@ int cmdline_forget_new(int argc, char *argv[],
 {
   const shared_ptr<terminal_io> term = create_terminal();
 
-  _error->DumpErrors();
+  consume_errors();
 
   // NB: perhaps we should allow forgetting the new state of just
   // a few packages?
   if(argc != 1)
     {
-      fprintf(stderr, _("E: The forget-new command takes no arguments\n"));
-      return -1;
+      _error->Error(_("The forget-new command takes no arguments"));
+      return 100;
     }  
 
   shared_ptr<OpProgress> progress = make_text_progress(false, term, term, term);
@@ -62,10 +62,7 @@ int cmdline_forget_new(int argc, char *argv[],
   apt_init(progress.get(), false, status_fname);
 
   if(_error->PendingError())
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   // In case we aren't root.
   if(!simulate)
@@ -74,10 +71,7 @@ int cmdline_forget_new(int argc, char *argv[],
     apt_cache_file->ReleaseLock();
 
   if(_error->PendingError())
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   if(simulate)
     printf(_("Would forget what packages are new\n"));
@@ -88,11 +82,7 @@ int cmdline_forget_new(int argc, char *argv[],
       (*apt_cache_file)->save_selection_list(*progress);
 
       if(_error->PendingError())
-	{
-	  _error->DumpErrors();
-
-	  return -1;
-	}
+        return 100;
     }
 
   return 0;
diff --git a/src/cmdline/cmdline_prompt.cc b/src/cmdline/cmdline_prompt.cc
index 25fadaa7..150c98fb 100644
--- a/src/cmdline/cmdline_prompt.cc
+++ b/src/cmdline/cmdline_prompt.cc
@@ -475,7 +475,10 @@ static bool prompt_essential(const shared_ptr<terminal_metrics> &term_metrics)
 
   if(!ok)
     {
-      printf(_("WARNING: Performing this action will probably cause your system to break!\n         Do NOT continue unless you know EXACTLY what you are doing!\n"));
+      printf(_("WARNING: Performing this action will probably cause your"
+               " system to break!\n"
+               "         Do NOT continue unless you know EXACTLY what you"
+               " are doing!\n"));
 
       string untranslated_prompt = N_("I am aware that this is a very bad idea");
       string prompt = _(untranslated_prompt.c_str());
@@ -739,8 +742,8 @@ bool cmdline_show_preview(bool as_upgrade, pkgset &to_install,
 	printf(_("Need to get %sB of archives. "),
 	       SizeToStr(f.DebBytes).c_str());
     }
-  else
-    _error->DumpErrors();
+  // else
+  //   _error->DumpErrors();
 
   if((*apt_cache_file)->UsrSize() >=0)
     printf(_("After unpacking %sB will be used.\n"),
diff --git a/src/cmdline/cmdline_resolver.cc b/src/cmdline/cmdline_resolver.cc
index d4f1ff14..22b97aac 100644
--- a/src/cmdline/cmdline_resolver.cc
+++ b/src/cmdline/cmdline_resolver.cc
@@ -887,7 +887,7 @@ cmdline_resolve_deps(pkgset &to_install,
 		aptitude_solution sol = calculate_current_solution(true, term_metrics);
 
 		if(_error->PendingError())
-		  _error->DumpErrors();
+                  _error->DumpErrors();
 
 		if(sol != lastsol || redisplay)
 		  {
@@ -1111,7 +1111,8 @@ cmdline_resolve_deps(pkgset &to_install,
 	  }
 	catch(cwidget::util::Exception &e)
 	  {
-	    cout << _("*** ERROR: search aborted by fatal exception.  You may continue\n           searching, but some solutions will be unreachable.")
+            cout << _("*** ERROR: search aborted by fatal exception.  You may continue\n"
+                      "           searching, but some solutions will be unreachable.")
 		 << endl
 		 << endl
 		 << e.errmsg();
diff --git a/src/cmdline/cmdline_search.cc b/src/cmdline/cmdline_search.cc
index 6e811db9..0d670cdb 100644
--- a/src/cmdline/cmdline_search.cc
+++ b/src/cmdline/cmdline_search.cc
@@ -98,15 +98,12 @@ namespace
                          const shared_ptr<terminal_metrics> &term_metrics,
                          const shared_ptr<terminal_output> &term_output)
   {
-    typedef std::vector<std::pair<pkgCache::PkgIterator, ref_ptr<structural_match> > >
-      results_list;
-
     const shared_ptr<progress> search_progress_display =
       create_progress_display(term_locale, term_metrics, term_output);
     const shared_ptr<throttle> search_progress_throttle =
       create_throttle();
 
-    results_list output;
+    pkg_results_list output;
     ref_ptr<search_cache> search_info(search_cache::create());
     for(std::vector<ref_ptr<pattern> >::const_iterator pIt = patterns.begin();
         pIt != patterns.end(); ++pIt)
@@ -129,15 +126,13 @@ namespace
 
     search_progress_display->done();
 
-    _error->DumpErrors();
-
     std::sort(output.begin(), output.end(),
               aptitude::cmdline::package_results_lt(sort_policy));
     output.erase(std::unique(output.begin(), output.end(),
                              aptitude::cmdline::package_results_eq(sort_policy)),
                  output.end());
 
-    for(results_list::const_iterator it = output.begin(); it != output.end(); ++it)
+    for(pkg_results_list::const_iterator it = output.begin(); it != output.end(); ++it)
       {
         column_parameters *p =
           new aptitude::cmdline::search_result_column_parameters(it->second);
@@ -157,7 +152,7 @@ namespace
         delete p;
       }
 
-    return 0;
+    return output.empty() ? 1 : 0;
   }
 }
 
@@ -174,13 +169,10 @@ int cmdline_search(int argc, char *argv[], const char *status_fname,
 
   pkg_sortpolicy *s=parse_sortpolicy(sort);
 
-  if(!s)
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+  if(s == NULL)
+    return 100;
 
-  _error->DumpErrors();
+  consume_errors();
 
   const unsigned int screen_width = term->get_screen_width();
   if(!width.empty())
@@ -194,9 +186,8 @@ int cmdline_search(int argc, char *argv[], const char *status_fname,
 
   if(!cw::util::transcode(display_format.c_str(), wdisplay_format))
     {
-      _error->DumpErrors();
-      fprintf(stderr, _("iconv of %s failed.\n"), display_format.c_str());
-      return -1;
+      _error->Error(_("iconv of %s failed"), display_format.c_str());
+      return 100;
     }
 
   boost::scoped_ptr<column_definition_list> columns;
@@ -205,15 +196,12 @@ int cmdline_search(int argc, char *argv[], const char *status_fname,
                               pkg_item::pkg_columnizer::defaults));
 
   if(columns.get() == NULL)
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   if(argc<=1)
     {
-      fprintf(stderr, _("search: You must provide at least one search term\n"));
-      return -1;
+      _error->Error(_("search: You must provide at least one search term"));
+      return 100;
     }
 
   shared_ptr<OpProgress> progress =
@@ -222,10 +210,7 @@ int cmdline_search(int argc, char *argv[], const char *status_fname,
   apt_init(progress.get(), true, status_fname);
 
   if(_error->PendingError())
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   vector<ref_ptr<pattern> > matchers;
 
@@ -235,11 +220,7 @@ int cmdline_search(int argc, char *argv[], const char *status_fname,
 
       ref_ptr<pattern> m = parse(arg);
       if(!m.valid())
-        {
-          _error->DumpErrors();
-
-          return -1;
-        }
+        return 100;
 
       matchers.push_back(m);
     }
diff --git a/src/cmdline/cmdline_show.cc b/src/cmdline/cmdline_show.cc
index 287404ac..56431c26 100644
--- a/src/cmdline/cmdline_show.cc
+++ b/src/cmdline/cmdline_show.cc
@@ -527,13 +527,20 @@ bool do_cmdline_show_target(const pkgCache::PkgIterator &pkg,
 			    bool has_explicit_source,
                             const shared_ptr<terminal_metrics> &term_metrics)
 {
-  if(verbose == 0 || has_explicit_source)
+  if(has_explicit_source == true)
     {
-      // HACK: default to current-or-candidate behavior.  This should be
-      // done in a more up-front way :-(.
-      if(source == cmdline_version_cand)
-	source = cmdline_version_curr_or_cand;
+      pkgCache::VerIterator ver = cmdline_find_ver(pkg, source, sourcestr,
+                                                   GlobalError::NOTICE);
+      if(ver.end() == true)
+        return false;
+
+      show_version(ver, verbose, term_metrics);
+    }
+  else if(verbose == 0)
+    {
+      _error->PushToStack();
       pkgCache::VerIterator ver = cmdline_find_ver(pkg, source, sourcestr);
+      _error->RevertToStack();
 
       if(ver.end())
 	ver = pkg.VersionList();
@@ -554,9 +561,8 @@ bool do_cmdline_show_target(const pkgCache::PkgIterator &pkg,
 
 bool do_cmdline_show(string s, int verbose, const shared_ptr<terminal_metrics> &term_metrics)
 {
-  cmdline_version_source source;
+  cmdline_version_source source = cmdline_version_cand;
   string name, sourcestr;
-  string default_release = aptcfg->Find("APT::Default-Release");
   bool has_explicit_source = false;
 
   if(!cmdline_parse_source(s, source, name, sourcestr))
@@ -564,99 +570,46 @@ bool do_cmdline_show(string s, int verbose, const shared_ptr<terminal_metrics> &
 
   has_explicit_source = (source != cmdline_version_cand);
 
-  if(source == cmdline_version_cand && !default_release.empty())
-    {
-      source    = cmdline_version_archive;
-      sourcestr = default_release;
-    }
-
-  bool is_pattern = aptitude::matching::is_pattern(name);
-  pkgCache::PkgIterator pkg;
-
-  if(!is_pattern)
-    {
-      pkg=(*apt_cache_file)->FindPkg(name);
-
-      if(pkg.end())
-	{
-	  _error->Error(_("Unable to locate package %s"), s.c_str());
-	  return false;
-	}
-    }
-
-  if(!is_pattern && !pkg.end())
-    return do_cmdline_show_target(pkg,
-                                  source,
-                                  sourcestr,
-                                  verbose,
-                                  has_explicit_source,
-                                  term_metrics);
-  else if(is_pattern)
-    {
-      using namespace aptitude::matching;
-      using cwidget::util::ref_ptr;
-
-      ref_ptr<pattern> p(parse(name));
-
-      if(!p.valid())
-	{
-	  _error->Error(_("Unable to parse pattern %s"), name.c_str());
-	  return false;
-	}
+  pkgset pkgset;
+  if(aptitude::cmdline::pkgset_from_string(&pkgset, name, GlobalError::NOTICE) == false)
+    return false;
 
-      std::vector<std::pair<pkgCache::PkgIterator, ref_ptr<structural_match> > > matches;
-      ref_ptr<search_cache> search_info(search_cache::create());
-      search(p, search_info,
-	     matches,
-	     *apt_cache_file,
-	     *apt_package_records);
+  bool rval = true;
 
-      for(std::vector<std::pair<pkgCache::PkgIterator, ref_ptr<structural_match> > >::const_iterator
-	    it = matches.begin(); it != matches.end(); ++it)
-	{
-	  if(!do_cmdline_show_target(it->first,
-                                     source,
-                                     sourcestr,
-                                     verbose,
-                                     has_explicit_source,
-                                     term_metrics))
-	    return false;
-	}
-    }
-  else
-    ; // TODO: print an error message -- Christian will kill me if I
-      // make the pofile bigger right now.
+  for(pkgset::const_iterator it = pkgset.begin();
+      it != pkgset.end();
+      ++it)
+    rval &= do_cmdline_show_target(*it,
+                                   source,
+                                   sourcestr,
+                                   verbose,
+                                   has_explicit_source,
+                                   term_metrics);
 
-  return true;
+  return rval;
 }
 
 int cmdline_show(int argc, char *argv[], int verbose)
 {
   shared_ptr<terminal_io> term = create_terminal();
 
-  _error->DumpErrors();
+  consume_errors();
 
   shared_ptr<OpProgress> progress = make_text_progress(true, term, term, term);
   apt_init(progress.get(), false);
 
   if(_error->PendingError())
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
+  bool found_any = false;
   for(int i=1; i<argc; ++i)
-    if(!do_cmdline_show(argv[i], verbose, term))
-      {
-	_error->DumpErrors();
-	return -1;
-      }
+    found_any |= do_cmdline_show(argv[i], verbose, term);
 
-  if(_error->PendingError())
+  if(!found_any)
     {
-      _error->DumpErrors();
-      return -1;
+      _error->Error(_("No packages found"));
+      return 100;
     }
 
-  return 0;
+  return _error->PendingError() ? 100 : 0;
 }
diff --git a/src/cmdline/cmdline_simulate.cc b/src/cmdline/cmdline_simulate.cc
index e63bd632..445e85ae 100644
--- a/src/cmdline/cmdline_simulate.cc
+++ b/src/cmdline/cmdline_simulate.cc
@@ -71,11 +71,11 @@ int cmdline_simulate(bool as_upgrade,
   pkgPackageManager::OrderResult Res=PM.DoInstall();
 
   if(Res==pkgPackageManager::Failed)
-    return -1;
+    return 100;
   else if(Res!=pkgPackageManager::Completed)
     {
       _error->Error(_("Internal Error, Ordering didn't finish"));
-      return -1;
+      return 100;
     }
   else
     return 0;
diff --git a/src/cmdline/cmdline_update.cc b/src/cmdline/cmdline_update.cc
index e5035e38..119f6647 100644
--- a/src/cmdline/cmdline_update.cc
+++ b/src/cmdline/cmdline_update.cc
@@ -48,29 +48,27 @@ int cmdline_update(int argc, char *argv[], int verbose)
 {
   shared_ptr<terminal_io> term = create_terminal();
 
-  _error->DumpErrors();
+  consume_errors();
 
   if(argc!=1)
     {
-      fprintf(stderr, _("E: The update command takes no arguments\n"));
-      return -1;
+      _error->Error(_("The update command takes no arguments"));
+      return 100;
     }
 
   // Don't exit if there's an error: it probably means that there
   // was a problem loading the package lists, so go ahead and try to
   // download new ones.
-  _error->DumpErrors();
+  consume_errors();
 
   download_update_manager m;
   m.pre_autoclean_hook.connect(sigc::ptr_fun(print_autoclean_msg));
   int rval =
     (cmdline_do_download(&m, verbose, term, term, term, term)
-     == download_manager::success ? 0 : -1);
+     == download_manager::success ? 0 : 100);
 
   if(_error->PendingError())
-    rval = -1;
-
-  _error->DumpErrors();
+    rval = 100;
 
   return rval;
 }
diff --git a/src/cmdline/cmdline_user_tag.cc b/src/cmdline/cmdline_user_tag.cc
index e3cd7726..3474cd9a 100644
--- a/src/cmdline/cmdline_user_tag.cc
+++ b/src/cmdline/cmdline_user_tag.cc
@@ -93,84 +93,50 @@ namespace aptitude
 	action = action_remove;
       else
 	{
-	  fprintf(stderr, "Internal error: cmdline_user_tag encountered an unknown command name \"%s\"\n",
-		  argv[0]);
-	  return -1;
+          _error->Error("Internal error: cmdline_user_tag encountered an"
+                        " unknown command name \"%s\"\n",
+                        argv[0]);
+	  return 100;
 	}
 
       if(argc < 3)
 	{
-	  fprintf(stderr,
-		  _("%s: too few arguments; expected at least a tag name and a package.\n"),
-		  argv[0]);
-	  return -1;
+          _error->Error(_("%s: too few arguments; expected at least a tag"
+                          " name and a package.\n"),
+                        argv[0]);
+	  return 100;
 	}
 
-      _error->DumpErrors();
+      consume_errors();
 
       OpProgress progress;
 
       apt_init(&progress, true);
       if(_error->PendingError())
-	{
-	  _error->DumpErrors();
-	  return -1;
-	}
+        return 100;
 
       std::string tag(argv[1]);
 
-      bool all_ok = true;
+      pkgset pkgset;
       for(int i = 2; i < argc; ++i)
-	{
-	  if(!aptitude::matching::is_pattern(argv[i]))
-	    {
-	      pkgCache::PkgIterator pkg = (*apt_cache_file)->FindPkg(argv[i]);
-	      if(pkg.end())
-		{
-		  if(quiet == 0)
-                    std::cerr << ssprintf(_("No such package \"%s\""), argv[i])
-                              << std::endl;
-		  all_ok = false;
-		}
-	      else
-		do_user_tag(action, tag, pkg, verbose);
-	    }
-	  else
-	    {
-	      using namespace aptitude::matching;
-	      using cwidget::util::ref_ptr;
-
-	      ref_ptr<pattern> p(parse(argv[i]));
-
-	      if(!p.valid())
-		{
-		  _error->DumpErrors();
-		  all_ok = false;
-		}
-	      else
-		{
-		  std::vector<std::pair<pkgCache::PkgIterator, ref_ptr<structural_match> > > matches;
-		  ref_ptr<search_cache> search_info(search_cache::create());
-		  search(p, search_info,
-			 matches,
-			 *apt_cache_file,
-			 *apt_package_records);
-
-		  for(std::vector<std::pair<pkgCache::PkgIterator, ref_ptr<structural_match> > >::const_iterator
-			it = matches.begin(); it != matches.end(); ++it)
-		    do_user_tag(action, tag, it->first, verbose);
-		}
-	    }
-	}
+        pkgset_from_string(&pkgset, argv[i]);
+
+      if(pkgset.empty() == true)
+        {
+          _error->Error(_("No packages found"));
+          return 100;
+        }
+
+      for(pkgset::const_iterator it = pkgset.begin();
+          it != pkgset.end();
+          ++it)
+        do_user_tag(action, tag, *it, verbose);
 
       shared_ptr<OpProgress> text_progress = make_text_progress(false, term, term, term);
       if(!(*apt_cache_file)->save_selection_list(*text_progress))
-	return 1;
-
-      if(!all_ok)
-	return 2;
+	return 100;
 
-      return 0;
+      return _error->PendingError() == true ? 100 : 0;
     }
   }
 }
diff --git a/src/cmdline/cmdline_util.cc b/src/cmdline/cmdline_util.cc
index 1165e3e4..6fb02999 100644
--- a/src/cmdline/cmdline_util.cc
+++ b/src/cmdline/cmdline_util.cc
@@ -1,6 +1,7 @@
 // cmdline_util.cc
 //
 // Copyright (C) 2004, 2010 Daniel Burrows
+// Copyright (C) 2012 Daniel Hartwig
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -38,6 +39,7 @@
 #include <generic/apt/matching/match.h>
 #include <generic/apt/matching/parse.h>
 #include <generic/apt/matching/pattern.h>
+#include <generic/apt/matching/serialize.h>
 #include <generic/apt/tasks.h>
 
 // System includes:
@@ -70,15 +72,16 @@ using boost::shared_ptr;
 
 namespace
 {
-  const int no_install_run_from_ui_preview_return = -1;
-  const int ui_preview_install_failed_return = -1;
+  const int no_install_run_from_ui_preview_return = 1;
+  const int ui_preview_install_failed_return = 100;
 
   // Completion routine for the UI preview; causes the program to
-  // return 0 if the install succeded and 1 otherwise.
+  // return 0 if the install succeded, 1 if the user cancelled,
+  // and 100 otherwise.
   //
   // There's a question in my mind of what to do if the user cancels
   // the preview or runs multiple previews.  At the moment we return
-  // -1 if the preview is cancelled and the result of the last install
+  // 1 if the preview is cancelled and the result of the last install
   // run otherwise.
   void ui_preview_complete(bool success, int *result)
   {
@@ -149,7 +152,8 @@ void cmdline_show_pkglist(pkgvector &items,
 
 pkgCache::VerIterator cmdline_find_ver(pkgCache::PkgIterator pkg,
 				       cmdline_version_source source,
-				       string sourcestr)
+				       string sourcestr,
+                                       GlobalError::MsgType error_type)
 {
   switch(source)
     {
@@ -164,9 +168,13 @@ pkgCache::VerIterator cmdline_find_ver(pkgCache::PkgIterator pkg,
 	if(candver.end())
 	  {
 	    if(source == cmdline_version_cand)
-	      printf(_("No candidate version found for %s\n"), pkg.FullName(true).c_str());
+              _error->Insert(error_type,
+                             _("No candidate version found for %s"),
+                             pkg.FullName(true).c_str());
 	    else
-	      printf(_("No current or candidate version found for %s\n"), pkg.FullName(true).c_str());
+              _error->Insert(error_type,
+                             _("No current or candidate version found for %s"),
+                             pkg.FullName(true).c_str());
 	  }
 
 	return candver;
@@ -190,9 +198,10 @@ pkgCache::VerIterator cmdline_find_ver(pkgCache::PkgIterator pkg,
 	      return ver;
 	  }
 
-      printf(_("Unable to find an archive \"%s\" for the package \"%s\"\n"),
-	     sourcestr.c_str(),
-	     pkg.FullName(true).c_str());
+      _error->Insert(error_type,
+                     _("Unable to find an archive \"%s\" for the package \"%s\""),
+                     sourcestr.c_str(),
+                     pkg.FullName(true).c_str());
 
       return pkgCache::VerIterator(*apt_cache_file, 0);
     case cmdline_version_version:
@@ -200,14 +209,15 @@ pkgCache::VerIterator cmdline_find_ver(pkgCache::PkgIterator pkg,
 	if(sourcestr==ver.VerStr())
 	  return ver;
 
-      printf(_("Unable to find a version \"%s\" for the package \"%s\"\n"),
-	     sourcestr.c_str(),
-	     pkg.FullName(true).c_str());
+      _error->Insert(error_type,
+                     _("Unable to find a version \"%s\" for the package \"%s\""),
+                     sourcestr.c_str(),
+                     pkg.FullName(true).c_str());
 
       return pkgCache::VerIterator(*apt_cache_file, 0);
     default:
-      printf(_("Internal error: invalid value %i passed to cmdline_find_ver!\n"),
-	     source);
+      _error->Error(_("Internal error: invalid value %i passed to cmdline_find_ver!"),
+                    source);
       return pkg.VersionList();
     }
 }
@@ -219,7 +229,7 @@ bool cmdline_parse_source(const string &input,
 {
   string scratch=input;
 
-  source=cmdline_version_cand;
+  // source=cmdline_version_cand;
   sourcestr="";
 
   if(scratch.find('/')!=scratch.npos)
@@ -235,10 +245,8 @@ bool cmdline_parse_source(const string &input,
   if(scratch.find('=')!=scratch.npos)
     {
       if(source==cmdline_version_archive)
-	{
-	  printf(_("You cannot specify both an archive and a version for a package\n"));
-	  return false;
-	}
+        return _error->Error(_("You cannot specify both an archive and a"
+                               " version for a package"));
 
       source=cmdline_version_version;
       string::size_type loc=scratch.rfind('=');
@@ -252,30 +260,6 @@ bool cmdline_parse_source(const string &input,
   return true;
 }
 
-bool cmdline_parse_task(string pattern,
-                        aptitude::apt::task &task,
-                        string &arch)
-{
-  const string::size_type archfound = pattern.find_last_of(':');
-  arch = "native";
-  if(archfound != string::npos)
-    {
-      arch = pattern.substr(archfound+1);
-      pattern.erase(archfound);
-    }
-
-  if(pattern[pattern.length() - 1] != '^')
-    return false;
-  pattern.erase(pattern.length() - 1);
-
-  const aptitude::apt::task *t = aptitude::apt::find_task(pattern);
-  if(t == NULL)
-    return _error->Error(_("Couldn't find task '%s'"), pattern.c_str());
-
-  task = *t;
-  return true;
-}
-
 namespace
 {
   /** \brief Used to display some statistics about how the cache
@@ -464,7 +448,7 @@ download_manager::result cmdline_do_download(download_manager *m,
       // otherwise.
       OpProgress tmpProgress;
       // Dump errors so we don't spuriously think we failed.
-      _error->DumpErrors();
+      consume_errors();
       apt_load_cache(&tmpProgress, false, NULL);
       initial_stats = compute_apt_stats();
     }
@@ -479,7 +463,7 @@ download_manager::result cmdline_do_download(download_manager *m,
 
   // Dump errors here because prepare() might check for pending errors
   // and think something failed.
-  _error->DumpErrors();
+  consume_errors();
 
   if(!m->prepare(*progress, *log.get(), log.get()))
     return download_manager::failure;
@@ -583,38 +567,53 @@ namespace aptitude
       if(apt_source_list == NULL)
 	return NULL;
 
+      source_package rval = source_package();
+      bool done = false;
+
+      _error->PushToStack();
       for(pkgSourceList::const_iterator i = apt_source_list->begin();
-	  i != apt_source_list->end(); ++i)
+          done != true && i != apt_source_list->end();
+          ++i)
 	{
 	  if((*i)->GetDist() != archive)
 	    continue;
 
 	  vector<pkgIndexFile *> *indexes = (*i)->GetIndexFiles();
 
-	  for(vector<pkgIndexFile *>::const_iterator j = indexes->begin();
-	      j != indexes->end(); ++j)
+          for(vector<pkgIndexFile *>::const_iterator j = indexes->begin();
+              done != true && j != indexes->end();
+              ++j)
 	    {
 	      std::auto_ptr<pkgSrcRecords::Parser> p((*j)->CreateSrcParser());
 
 	      if(_error->PendingError())
-		return source_package();
-	      if(p.get() != 0)
+		done = true;
+	      else if(p.get() != 0)
 		{
 		  // Step through the file until we reach the end or find
 		  // the package:
 		  while(p.get()->Step() == true)
 		    {
 		      if(_error->PendingError() == true)
-			return source_package();
+                        {
+                          done = true;
+                          break;
+                        }
 
 		      if(p.get()->Package() == source_name)
-			return source_package(p.get());
+                        {
+                          rval = source_package(p.get());
+                          done = true;
+                          break;
+                        }
 		    }
 		}
 	    }
 	}
 
-      return source_package();
+      _error->RevertToStack();
+
+      return rval;
     }
 
     source_package find_source_package(const std::string &package,
@@ -651,7 +650,6 @@ namespace aptitude
 	  // version.
 
 	case cmdline_version_archive:
-	  _error->DumpErrors();
 	  rval = find_source_by_archive(source_package_name, version_source_string);
 	  break;
 
@@ -669,7 +667,8 @@ namespace aptitude
 	{
 	  pkgCache::VerIterator ver = cmdline_find_ver(pkg,
 						       version_source,
-						       version_source_string);
+						       version_source_string,
+                                                       GlobalError::NOTICE);
 
 	  if(!ver.end())
 	    {
@@ -718,7 +717,6 @@ namespace aptitude
 	      break; // We would have tried already if it was possible.
 
 	    case cmdline_version_archive:
-	      _error->DumpErrors();
 	      rval = find_source_by_archive(source_package_name, version_source_string);
 	      break;
 
@@ -731,6 +729,49 @@ namespace aptitude
       return rval;
     }
 
+
+    bool read_user_tag_applications(std::vector<tag_application> &user_tags,
+                                    const char *config_item,
+                                    const bool is_add, const bool implicit)
+    {
+      const Configuration::Item *tree = aptcfg->Tree(config_item);
+      if(tree == NULL)
+        return true;
+
+      for(Configuration::Item *item = tree->Child;
+          item != NULL;
+          item = item->Next)
+        {
+          if(implicit)
+            user_tags.push_back(tag_application(is_add, item->Value, NULL));
+          else
+            {
+              const std::string arg(item->Value);
+              const std::string::size_type splitloc = arg.find(',');
+              if(splitloc == arg.npos)
+                return _error->Error(_("No comma following tag name \"%s\""),
+                                     arg.c_str());
+              else
+                {
+                  const std::string patternstr(arg, splitloc + 1);
+                  const std::vector<const char *> terminators;
+                  cwidget::util::ref_ptr<aptitude::matching::pattern> p =
+                    aptitude::matching::parse(patternstr,
+                                              terminators,
+                                              true,
+                                              false);
+                  if(p.valid() == false)
+                    return false;
+
+                  const std::string tag(arg, 0, splitloc);
+                  user_tags.push_back(tag_application(is_add, tag, p));
+                }
+            }
+        }
+
+      return true;
+    }
+
     void apply_user_tags(const std::vector<tag_application> &user_tags)
     {
       using namespace matching;
@@ -812,5 +853,197 @@ namespace aptitude
 
       return output;
     }
+
+    pkgCache::PkgIterator pkg_from_name(const string &str,
+                                        GlobalError::MsgType error_type)
+    {
+      pkgCache::PkgIterator pkg = (*apt_cache_file)->FindPkg(str.c_str());
+
+      if(pkg.end() == true)
+        _error->Insert(error_type,
+                       _("Unable to locate package %s"), str.c_str());
+      return pkg;
+    }
+
+    bool pkgset_from_group(pkgset * const pkgset, string name,
+                           GlobalError::MsgType error_type)
+    {
+      const string::size_type archfound = name.find_last_of(':');
+      string arch;
+      if(archfound != string::npos)
+        {
+          arch = name.substr(archfound + 1);
+          name.erase(archfound);
+        }
+
+      pkgCache::GrpIterator grp = (*apt_cache_file)->FindGrp(name);
+      if(grp.end() == false)
+        {
+          if(arch.empty() == true)
+            {
+              pkgCache::PkgIterator pkg = grp.FindPreferredPkg();
+              if(pkg.end() == false)
+                {
+                  pkgset->insert(pkg);
+                  return true;
+                }
+            }
+          else
+            {
+              bool found = false;
+              // for 'linux-any' return the first package matching,
+              // for 'linux-*' return all matches
+              const bool is_global = arch.find('*') != string::npos;
+              APT::CacheFilter::PackageArchitectureMatchesSpecification pams(arch);
+              for(pkgCache::PkgIterator pkg = grp.PackageList();
+                  pkg.end() == false;
+                  pkg = grp.NextPkg(pkg))
+                {
+                  if(pams(pkg) == false)
+                    continue;
+                  pkgset->insert(pkg);
+                  found = true;
+                  if(is_global == false)
+                    break;
+                }
+              if(found == true)
+                return true;
+            }
+        }
+
+      _error->Insert(error_type,
+                     _("Unable to locate package %s"), name.c_str());
+      return false;
+    }
+
+    bool pkgset_from_task(pkgset * const pkgset, string pattern,
+                          GlobalError::MsgType error_type)
+    {
+      const string::size_type archfound = pattern.find_last_of(':');
+      string arch = "native";
+      if(archfound != string::npos)
+        {
+          arch = pattern.substr(archfound+1);
+          pattern.erase(archfound);
+        }
+
+      if(pattern[pattern.length() - 1] != '^')
+        return false;
+      pattern.erase(pattern.length() - 1);
+
+      const aptitude::apt::task *t = aptitude::apt::find_task(pattern);
+      if(t == NULL)
+        return _error->Insert(error_type,
+                              _("Couldn't find task '%s'"), pattern.c_str());
+
+      printf(_("Note: selecting the task \"%s: %s\" for installation\n"),
+             t->name.c_str(), cw::util::transcode(t->shortdesc).c_str());
+
+      aptitude::apt::get_task_packages(pkgset, *t, arch);
+      return true;
+    }
+
+    bool pkgset_from_pattern(pkgset * const pkgset,
+                             cw::util::ref_ptr<aptitude::matching::pattern> pattern,
+                             string pattern_str,
+                             GlobalError::MsgType error_type)
+    {
+      namespace m = aptitude::matching;
+
+      m::pkg_results_list matches;
+      cw::util::ref_ptr<m::search_cache> search_info(m::search_cache::create());
+      m::search(pattern,
+                search_info,
+                matches,
+                *apt_cache_file,
+                *apt_package_records);
+
+      if(matches.empty() == true)
+        {
+          if(pattern_str.empty() == true)
+            pattern_str = m::serialize_pattern(pattern);
+          return _error->Insert(error_type,
+                                _("Couldn't find any package for pattern '%s'"),
+                                pattern_str.c_str());
+        }
+
+      for(m::pkg_results_list::const_iterator it = matches.begin();
+          it != matches.end();
+          ++it)
+        pkgset->insert(it->first);
+
+      return true;
+    }
+
+    bool pkgset_from_regex(pkgset * const pkgset, string pattern,
+                           GlobalError::MsgType error_type)
+    {
+      namespace m = aptitude::matching;
+      using cw::util::ref_ptr;
+
+      static const char * const isregex = ".?+|[^$";
+      if(pattern.find_first_of(isregex) == std::string::npos)
+        return false;
+
+      std::string regex = pattern;
+      size_t archfound = regex.find_last_of(':');
+      std::string arch = "native";
+      if(archfound != std::string::npos)
+        {
+          arch = regex.substr(archfound+1);
+          if(arch.find_first_of(isregex) == std::string::npos)
+            regex.erase(archfound);
+          else
+            archfound = std::string::npos;
+        }
+
+      ref_ptr<m::pattern> p = m::pattern::make_name(regex);
+      if(p.valid() == false)
+        return false;
+      if(archfound != std::string::npos)
+        p = m::pattern::make_and(p, m::pattern::make_architecture(arch));
+
+      return pkgset_from_pattern(pkgset, p, pattern, error_type);
+    }
+
+    bool pkgset_from_pattern(pkgset * const pkgset, string pattern,
+                             GlobalError::MsgType error_type)
+    {
+      namespace m = aptitude::matching;
+      using cwidget::util::ref_ptr;
+
+      if(m::is_pattern(pattern) == false)
+        return false;
+
+      ref_ptr<m::pattern> p(m::parse(pattern));
+      if(p.valid() == false)
+        return false;
+
+      return pkgset_from_pattern(pkgset, p, pattern, error_type);
+    }
+
+    bool pkgset_from_string(pkgset * const pkgset, string str,
+                            GlobalError::MsgType error_type,
+                            GlobalError::MsgType pattern_error_type)
+    {
+      bool found = true;
+      _error->PushToStack();
+
+      if(aptitude::matching::is_pattern(str) == false)
+        {
+          if(pkgset_from_group(pkgset, str, error_type) == false
+             && pkgset_from_task(pkgset, str, error_type) == false
+             && pkgset_from_regex(pkgset, str, error_type) == false)
+            found = false;
+        }
+      else if(pkgset_from_pattern(pkgset, str, pattern_error_type) == false)
+        found = false;
+
+      if(found == true)
+        _error->RevertToStack();
+      else
+        _error->MergeWithStack();
+      return found;
+    }
   }
 }
diff --git a/src/cmdline/cmdline_util.h b/src/cmdline/cmdline_util.h
index 9b88c393..26fad8ac 100644
--- a/src/cmdline/cmdline_util.h
+++ b/src/cmdline/cmdline_util.h
@@ -1,6 +1,7 @@
 // cmdline_util.h                                   -*-c++-*-
 //
 // Copyright (C) 2004, 2010 Daniel Burrows
+// Copyright (C) 2012 Daniel Hartwig
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -65,7 +66,8 @@ void cmdline_show_stringlist(strvector &items,
  */
 pkgCache::VerIterator cmdline_find_ver(pkgCache::PkgIterator pkg,
 				       cmdline_version_source source,
-				       string sourcestr);
+				       string sourcestr,
+                                       GlobalError::MsgType error_type = GlobalError::ERROR);
 
 /** Starts up the visual UI in preview mode, and exits with status 0
  *  when the UI shuts down.
@@ -94,10 +96,6 @@ bool cmdline_parse_source(const string &input,
 			  string &package,
 			  string &sourcestr);
 
-bool cmdline_parse_task(std::string pattern,
-                        aptitude::apt::task &task,
-                        std::string &arch);
-
 /** Run the given download and post-download commands using the
  *  standard command-line UI.  Runs the preparation routine, the
  *  actual download, and the post-download commands.
@@ -221,6 +219,17 @@ namespace aptitude
       get_pattern() const { return pattern; }
     };
 
+    /** \brief Read user-tag application requests from a configuration tree.
+     *
+     *  \param user_tags The vector to which the applications will be added.
+     *  \param config_item Name of the configuration item tree to read from.
+     *  \param is_add \b true if these are add requests.
+     *  \param implicit \b true if these are implicit requests.
+     */
+    bool read_user_tag_applications(std::vector<tag_application> &user_tags,
+                                    const char *config_item,
+                                    const bool is_add, const bool implicit);
+
     /** \brief Apply explicit and implicit user-tags to packages.
      *
      *  Explicit tags are applied where their associated pattern holds;
@@ -431,6 +440,39 @@ namespace aptitude
         return std::wstring();
       }
     };
+
+    bool pkgset_from_group(pkgset * const pkgset, string name,
+                           GlobalError::MsgType error_type = GlobalError::ERROR);
+
+    bool pkgset_from_task(pkgset * const pkgset, string pattern,
+                          GlobalError::MsgType error_type = GlobalError::ERROR);
+
+    /** \brief Fill a pkgset using the given regex to match package
+     *  names.
+     */
+    bool pkgset_from_regex(pkgset * const pkgset, string pattern,
+                           GlobalError::MsgType error_type = GlobalError::ERROR);
+
+    /** \brief Fill a pkgset using the given matching pattern.
+     *
+     *  This does not try any string as a search pattern, only those
+     *  which contain explicit search terms or regex characters.
+     */
+    bool pkgset_from_pattern(pkgset * const pkgset, string pattern,
+                             GlobalError::MsgType error_type = GlobalError::ERROR);
+
+    /** \brief Fill a pkgset using the given string.  If the
+     *  string names exactly a package then insert that package,
+     *  otherwise, if the string is a search pattern, add all matching
+     *  packages.
+     *
+     *  Based on cacheset.cc(PackageContainerInterface::FromString).
+     *  TODO: Should be replaced with cacheset functions once we have
+     *  become more compatible with them.
+     */
+    bool pkgset_from_string(pkgset * const pkgset, string str,
+                            GlobalError::MsgType error_type = GlobalError::ERROR,
+                            GlobalError::MsgType pattern_error_type = GlobalError::NOTICE);
   }
 }
 
diff --git a/src/cmdline/cmdline_versions.cc b/src/cmdline/cmdline_versions.cc
index 57e95d17..936ddd59 100644
--- a/src/cmdline/cmdline_versions.cc
+++ b/src/cmdline/cmdline_versions.cc
@@ -51,6 +51,7 @@
 #include <sigc++/bind.h>
 
 #include <cwidget/generic/util/ref_ptr.h>
+#include <cwidget/generic/util/ssprintf.h>
 
 #include <vector>
 
@@ -252,7 +253,7 @@ namespace
                          const shared_ptr<terminal_metrics> &term_metrics,
                          const shared_ptr<terminal_output> &term_output)
   {
-    // Set to -1 if any exact-name matches fail.  Also set to -1 if
+    // Set to 100 if any exact-name matches fail.  Also set to 1 if
     // there are no results at all.
     int return_value = 0;
 
@@ -291,16 +292,16 @@ namespace
         if(output_size == output.size() &&
            (*pIt)->get_type() == m::pattern::exact_name)
           {
-            return_value = 1;
-            _error->Error(_("No such package \"%s\""),
+            return_value = 100;
+            _error->Error(_("Unable to locate package %s"),
                           (*pIt)->get_exact_name_name().c_str());
           }
       }
 
     search_progress_display->done();
 
-    if(output.empty())
-      return_value = 2;
+    if(output.empty() && return_value == 0)
+      return_value = 1;
 
     // Decide how and whether to group the results.  Not initialized
     // so the compiler will check that we always assign a value.
@@ -388,7 +389,7 @@ namespace
         break;
 
       default:
-        _error->Error("Internal error: invalid show-package-names option.");
+        _error->Error("Internal error: invalid show-package-names option");
         do_show_package_names = package_names_should_auto_show;
         break;
       }
@@ -544,12 +545,9 @@ int cmdline_versions(int argc, char *argv[], const char *status_fname,
   pkg_sortpolicy *sort_policy = parse_sortpolicy(sort);
 
   if(!sort_policy)
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
-  _error->DumpErrors();
+  consume_errors();
 
   const unsigned int screen_width = term->get_screen_width();
   if(!width.empty())
@@ -563,9 +561,8 @@ int cmdline_versions(int argc, char *argv[], const char *status_fname,
 
   if(!cw::util::transcode(display_format.c_str(), wdisplay_format))
     {
-      _error->DumpErrors();
-      fprintf(stderr, _("iconv of %s failed.\n"), display_format.c_str());
-      return -1;
+      _error->Error(_("iconv of %s failed"), display_format.c_str());
+      return 100;
     }
 
   boost::scoped_ptr<cw::config::column_definition_list> columns;
@@ -574,15 +571,12 @@ int cmdline_versions(int argc, char *argv[], const char *status_fname,
                               pkg_item::pkg_columnizer::defaults));
 
   if(columns.get() == NULL)
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   if(argc <= 1)
     {
-      fprintf(stderr, _("versions: You must provide at least one package selector\n"));
-      return -1;
+      _error->Error(_("versions: You must provide at least one package selector"));
+      return 100;
     }
 
   OpProgress progress;
@@ -590,28 +584,48 @@ int cmdline_versions(int argc, char *argv[], const char *status_fname,
   apt_init(&progress, true, status_fname);
 
   if(_error->PendingError())
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   std::vector<cw::util::ref_ptr<m::pattern> > matchers;
 
+  bool parsing_arguments_failed = false;
+
   for(int i = 1; i < argc; ++i)
     {
       const char * const arg = argv[i];
 
-      cw::util::ref_ptr<m::pattern> m = m::parse(arg);
-      if(!m.valid())
-	{
-	  _error->DumpErrors();
-
-	  return -1;
-	}
-
-      matchers.push_back(m);
+      cw::util::ref_ptr<m::pattern> m;
+      const pkgCache::PkgIterator pkg = (*apt_cache_file)->FindPkg(arg);
+      if(pkg.end() == false)
+        {
+          std::string name(arg);
+          const std::string::size_type archfound = name.find_last_of(':');
+          if(archfound != std::string::npos)
+            {
+              const std::string arch = name.substr(archfound + 1);
+              name.erase(archfound);
+              m = m::pattern::make_and(m::pattern::make_exact_name(pkg.Name()),
+                                       m::pattern::make_architecture(arch));
+            }
+          else
+            {
+              m = m::pattern::make_exact_name(pkg.Name());
+            }
+        }
+      else if(m::is_pattern(arg) == true)
+        m = m::parse(arg);
+      else
+        _error->Error(_("Unable to locate package %s"), arg);
+
+      if(m.valid() == false)
+        parsing_arguments_failed = true;
+      else
+        matchers.push_back(m);
     }
 
+  if(parsing_arguments_failed == true)
+    return 100;
+
   return do_search_versions(matchers,
                             sort_policy,
                             *columns,
diff --git a/src/cmdline/cmdline_why.cc b/src/cmdline/cmdline_why.cc
index 6781d6b7..402cc272 100644
--- a/src/cmdline/cmdline_why.cc
+++ b/src/cmdline/cmdline_why.cc
@@ -1290,18 +1290,14 @@ bool interpret_why_args(const std::vector<std::string> &args,
   for(std::vector<std::string>::const_iterator it = args.begin();
       it != args.end(); ++it)
     {
-      // If there isn't a tilde, treat it as an exact package name.
       cwidget::util::ref_ptr<pattern> p;
-      if(!aptitude::matching::is_pattern(*it))
-	{
-	  pkgCache::PkgIterator pkg = (*apt_cache_file)->FindPkg(*it);
-	  if(pkg.end())
-	    _error->Error(_("No package named \"%s\" exists."), it->c_str());
-	  else
-	    p = pattern::make_name(ssprintf("^%s$", pkg.Name()));
-	}
+      pkgCache::PkgIterator pkg = (*apt_cache_file)->FindPkg(*it);
+      if(pkg.end() == false)
+        p = pattern::make_exact_name(pkg.Name());
+      else if(aptitude::matching::is_pattern(*it) == true)
+        p = parse(*it);
       else
-	p = parse(*it);
+        _error->Error(_("Unable to locate package %s"), (*it).c_str());
 
       if(!p.valid())
 	parsing_arguments_failed = true;
@@ -1359,13 +1355,14 @@ int cmdline_why(int argc, char *argv[],
 {
   const shared_ptr<terminal_io> term = create_terminal();
 
-  _error->DumpErrors();
+  consume_errors();
 
   if(argc < 2)
     {
-      fprintf(stderr, _("%s: this command requires at least one argument (the package to query).\n"),
-	      argv[0]);
-      return -1;
+      _error->Error(_("%s: this command requires at least one argument (the"
+                      " package to query)"),
+                    argv[0]);
+      return 100;
     }
 
   OpProgress progress;
@@ -1373,10 +1370,7 @@ int cmdline_why(int argc, char *argv[],
   apt_init(&progress, true, status_fname);
 
   if(_error->PendingError())
-    {
-      _error->DumpErrors();
-      return -1;
-    }
+    return 100;
 
   // Keep track of whether any argument couldn't be parsed, but
   // don't bail until we finish parsing, so we can display all
@@ -1385,10 +1379,10 @@ int cmdline_why(int argc, char *argv[],
 
   const char *pkgname = argv[argc - 1];
   bool is_removal = is_why_not;
-  pkgCache::PkgIterator pkg = (*apt_cache_file)->FindPkg(argv[argc - 1]);
+  pkgCache::PkgIterator pkg = (*apt_cache_file)->FindPkg(pkgname);
   if(pkg.end())
     {
-      _error->Error(_("No package named \"%s\" exists."), pkgname);
+      _error->Error(_("Unable to locate package %s"), pkgname);
       parsing_arguments_failed = true;
     }
 
@@ -1410,13 +1404,9 @@ int cmdline_why(int argc, char *argv[],
 	matchers.push_back(p);
     }
 
-
-
-  _error->DumpErrors();
-
   int rval;
   if(parsing_arguments_failed)
-    rval = -1;
+    rval = 100;
   else
     rval = do_why(matchers,
                   pkg,
diff --git a/src/cmdline/mocks/Makefile.in b/src/cmdline/mocks/Makefile.in
index 9d15abcb..a7b95f95 100644
--- a/src/cmdline/mocks/Makefile.in
+++ b/src/cmdline/mocks/Makefile.in
@@ -193,6 +193,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/desc_render.cc b/src/desc_render.cc
index 0bc640c7..c0bb4c5f 100644
--- a/src/desc_render.cc
+++ b/src/desc_render.cc
@@ -103,30 +103,19 @@ cw::fragment *make_tags_fragment(const pkgCache::PkgIterator &pkg)
   if(pkg.end())
     return NULL;
 
-#ifdef HAVE_EPT
   using aptitude::apt::get_fullname;
   using aptitude::apt::get_tags;
   using aptitude::apt::tag;
-#endif
 
-#ifdef HAVE_EPT
-  const set<tag> realS(get_tags(pkg));
-  const set<tag> * const s(&realS);
-#else
-  const set<tag> * const s(get_tags(pkg));
-#endif
+  const set<tag> s(get_tags(pkg));
 
   vector<cw::fragment *> rval;
-  if(s != NULL && !s->empty())
+  if(s.empty() == false)
     {
       vector<cw::fragment *> tags;
-      for(set<tag>::const_iterator i = s->begin(); i != s->end(); ++i)
+      for(set<tag>::const_iterator i = s.begin(); i != s.end(); ++i)
 	{
-#ifdef HAVE_EPT
 	  std::string name(get_fullname(*i));
-#else
-	  const std::string name(i->str());
-#endif
 
 	  tags.push_back(cw::text_fragment(name));
 	}
diff --git a/src/generic/Makefile.in b/src/generic/Makefile.in
index b05fce2e..5c146a63 100644
--- a/src/generic/Makefile.in
+++ b/src/generic/Makefile.in
@@ -209,6 +209,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/generic/apt/Makefile.in b/src/generic/apt/Makefile.in
index 88d7cfe4..75c27a6b 100644
--- a/src/generic/apt/Makefile.in
+++ b/src/generic/apt/Makefile.in
@@ -253,6 +253,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/generic/apt/apt.cc b/src/generic/apt/apt.cc
index d534b436..39641202 100644
--- a/src/generic/apt/apt.cc
+++ b/src/generic/apt/apt.cc
@@ -486,11 +486,7 @@ void apt_load_cache(OpProgress *progress_bar, bool do_initselections,
   LOG_TRACE(logger, "Loading task information.");
   aptitude::apt::load_tasks(*progress_bar);
   LOG_TRACE(logger, "Loading tags.");
-#ifndef HAVE_EPT
-  load_tags(*progress_bar);
-#else
-  aptitude::apt::load_tags();
-#endif
+  aptitude::apt::load_tags(progress_bar);
 
   if(user_pkg_hier)
     {
diff --git a/src/generic/apt/download_install_manager.cc b/src/generic/apt/download_install_manager.cc
index 9c779f86..24fc4edf 100644
--- a/src/generic/apt/download_install_manager.cc
+++ b/src/generic/apt/download_install_manager.cc
@@ -38,8 +38,12 @@
 using namespace std;
 
 download_install_manager::download_install_manager(bool _download_only,
+                                                   bool _fix_missing,
 						   const run_dpkg_in_terminal_func &_run_dpkg_in_terminal)
-  : log(NULL), download_only(_download_only), pm(new pkgDPkgPM(*apt_cache_file)),
+  : log(NULL),
+    download_only(_download_only),
+    fix_missing(_fix_missing),
+    pm(new pkgDPkgPM(*apt_cache_file)),
     run_dpkg_in_terminal(_run_dpkg_in_terminal)
 {
 }
@@ -102,7 +106,7 @@ bool download_install_manager::prepare(OpProgress &progress,
 
 download_manager::result download_install_manager::finish_pre_dpkg(pkgAcquire::RunResult res)
 {
-  if(res != pkgAcquire::Continue)
+  if(res == pkgAcquire::Failed)
     return failure;
 
   bool failed=false;
@@ -110,15 +114,18 @@ download_manager::result download_install_manager::finish_pre_dpkg(pkgAcquire::R
       i != fetcher->ItemsEnd(); ++i)
     {
       if((*i)->Status == pkgAcquire::Item::StatDone &&
-	 (*i)->Complete)
+	 (*i)->Complete == true)
 	continue;
 
       if((*i)->Status == pkgAcquire::Item::StatIdle)
-	continue;
+        {
+          // Transient = true;
+          continue;
+        }
 
       failed=true;
-      _error->Error(_("Failed to fetch %s: %s"), (*i)->DescURI().c_str(), (*i)->ErrorText.c_str());
-      break;
+      _error->Warning(_("Failed to fetch %s: %s"),
+                      (*i)->DescURI().c_str(), (*i)->ErrorText.c_str());
     }
 
   if(download_only)
@@ -135,6 +142,13 @@ download_manager::result download_install_manager::finish_pre_dpkg(pkgAcquire::R
 	}
     }
 
+  if(failed == true && fix_missing == false)
+    {
+      _error->Error(_("Unable to fetch some archives, maybe run aptitude"
+                      " update or try with --fix-missing?"));
+      return failure;
+    }
+
   if(failed && !pm->FixMissing())
     {
       _error->Error(_("Unable to correct for unavailable packages"));
@@ -148,13 +162,20 @@ download_manager::result download_install_manager::finish_pre_dpkg(pkgAcquire::R
   // control the code at dpkg's end), them's the breaks.
   apt_cache_file->ReleaseLock();
 
-  result rval = success;
+  download_manager::result rval;
 
   const pkgPackageManager::OrderResult pre_fork_result =
     pm->DoInstallPreFork();
 
-  if(pre_fork_result == pkgPackageManager::Failed)
-    rval = failure;
+  switch(pre_fork_result)
+    {
+    case pkgPackageManager::Completed:  rval = success; break;
+    case pkgPackageManager::Failed:     rval = failure; break;
+    case pkgPackageManager::Incomplete: rval = do_again; break;
+    default:
+      rval = failure;
+      _error->Error("Unexpected result from pkgPackageManager::DoInstallPreFork");
+    }
 
   return rval;
 }
@@ -171,7 +192,7 @@ pkgPackageManager::OrderResult download_install_manager::run_dpkg(int status_fd)
   switch(pmres)
     {
     case pkgPackageManager::Failed:
-      _error->DumpErrors();
+      _error->DumpErrors(std::cerr, GlobalError::WARNING, false);
       cerr << _("A package failed to install.  Trying to recover:") << endl;
       if(system("DPKG_NO_TSTP=1 dpkg --configure -a") != 0) { /* ignore */ }
       break;
@@ -191,16 +212,15 @@ void download_install_manager::finish_post_dpkg(pkgPackageManager::OrderResult d
 						OpProgress *progress,
 						const sigc::slot1<void, result> &k)
 {
-  result rval = success;
-
+  result rval;
   switch(dpkg_result)
     {
     case pkgPackageManager::Failed:
       rval = failure;
       break;
     case pkgPackageManager::Completed:
+      rval = success;
       break;
-
     case pkgPackageManager::Incomplete:
       rval = do_again;
       break;
@@ -208,15 +228,23 @@ void download_install_manager::finish_post_dpkg(pkgPackageManager::OrderResult d
 
   fetcher->Shutdown();
 
+  if(_error->PendingError() == true)
+    rval = failure;
+
   // Get the archives again.  This was necessary for multi-CD
   // installs, according to my comments in an old commit log in the
   // Subversion repository.
-  if(!pm->GetArchives(fetcher, &src_list, apt_package_records))
-    rval = failure;
-  else if(!apt_cache_file->GainLock())
+  if(rval == do_again)
+    {
+      if(!pm->GetArchives(fetcher, &src_list, apt_package_records))
+        rval = failure;
+    }
+
+  if(!apt_cache_file->GainLock())
     // This really shouldn't happen.
     {
-      _error->Error(_("Could not regain the system lock!  (Perhaps another apt or dpkg is running?)"));
+      _error->Error(_("Could not regain the system lock!  (Perhaps another"
+                      " apt or dpkg is running?)"));
       rval = failure;
     }
 
@@ -257,7 +285,7 @@ void download_install_manager::finish(pkgAcquire::RunResult result,
 {
   const download_manager::result pre_res = finish_pre_dpkg(result);
 
-  if(pre_res == success && !download_only)
+  if(pre_res != failure && !download_only)
     {
       run_dpkg_in_terminal(sigc::mem_fun(*this, &download_install_manager::run_dpkg),
 			   sigc::bind(sigc::mem_fun(*this, &download_install_manager::finish_post_dpkg),
@@ -268,7 +296,6 @@ void download_install_manager::finish(pkgAcquire::RunResult result,
   else
     {
       pkgPackageManager::OrderResult res;
-
       switch(pre_res)
 	{
 	case success:
@@ -278,9 +305,11 @@ void download_install_manager::finish(pkgAcquire::RunResult result,
 	  res = pkgPackageManager::Incomplete;
 	  break;
 	case failure:
-	default:
 	  res = pkgPackageManager::Failed;
 	  break;
+        default:
+          res = pkgPackageManager::Failed;
+          _error->Error("Unexpected result from download_install_manager::finish_pre_dpkg");
 	}
 
       finish_post_dpkg(res,
diff --git a/src/generic/apt/download_install_manager.h b/src/generic/apt/download_install_manager.h
index 24989883..069a1a41 100644
--- a/src/generic/apt/download_install_manager.h
+++ b/src/generic/apt/download_install_manager.h
@@ -59,6 +59,10 @@ class download_install_manager : public download_manager
   /** If \b true, don't actually invoke the package manager. */
   bool download_only;
 
+  /** If \b true, attempt to correct for packages which fail
+      to download or are unavailable. */
+  bool fix_missing;
+
   /** The package manager object used when installing packages */
   pkgPackageManager *pm;
 
@@ -112,6 +116,7 @@ public:
    *  \param _run_dpkg_in_terminal  how to set up the terminal for dpkg.
    */
   download_install_manager(bool _download_only,
+                           bool _fix_missing,
 			   const run_dpkg_in_terminal_func &_run_dpkg_in_terminal);
   ~download_install_manager();
 
diff --git a/src/generic/apt/history/Makefile.in b/src/generic/apt/history/Makefile.in
index 234abb1e..8051e991 100644
--- a/src/generic/apt/history/Makefile.in
+++ b/src/generic/apt/history/Makefile.in
@@ -192,6 +192,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/generic/apt/matching/Makefile.in b/src/generic/apt/matching/Makefile.in
index 6fe26009..6678b084 100644
--- a/src/generic/apt/matching/Makefile.in
+++ b/src/generic/apt/matching/Makefile.in
@@ -194,6 +194,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/generic/apt/matching/compare_patterns.cc b/src/generic/apt/matching/compare_patterns.cc
index 7e5159ef..f8414aef 100644
--- a/src/generic/apt/matching/compare_patterns.cc
+++ b/src/generic/apt/matching/compare_patterns.cc
@@ -99,7 +99,8 @@ namespace aptitude
 				    p2->get_any_version_pattern());
 
 	  case pattern::architecture:
-	    return p1->get_architecture_architecture().compare(p2->get_architecture_architecture());
+	    return p1->get_architecture_arch_specification()->get_specification()
+              .compare(p2->get_architecture_arch_specification()->get_specification());
 
 	  case pattern::automatic:
 	    return 0;
diff --git a/src/generic/apt/matching/match.cc b/src/generic/apt/matching/match.cc
index 6e3a1763..7f66f7d4 100644
--- a/src/generic/apt/matching/match.cc
+++ b/src/generic/apt/matching/match.cc
@@ -31,20 +31,11 @@
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/version.h>
+#include <apt-pkg/cachefilter.h>
 
 #include <cwidget/generic/util/transcode.h>
 
-#ifdef HAVE_EPT_TEXTSEARCH
-#include <ept/textsearch/textsearch.h>
-#else
-#ifdef HAVE_EPT_AXI
-#include <ept/axi/axi.h>
-#else
-#error "Don't know how to use the debtags Xapian database."
-#endif
-#endif
-
-#include <xapian/enquire.h>
+#include <xapian.h>
 
 #include <algorithm>
 
@@ -64,22 +55,6 @@ namespace aptitude
   {
     namespace
     {
-#ifdef HAVE_EPT_TEXTSEARCH
-      typedef ept::textsearch::TextSearch debtags_db;
-
-      const Xapian::docid get_docid_by_name(const debtags_db &db,
-                                            const char *name)
-      {
-        return db.docidByName(name);
-      }
-
-      const Xapian::Database &get_xapian_db(const debtags_db &db)
-      {
-        return db.db();
-      }
-#endif
-
-#ifdef HAVE_EPT_AXI
       typedef Xapian::Database debtags_db;
 
       const Xapian::docid get_docid_by_name(const debtags_db &db,
@@ -99,7 +74,6 @@ namespace aptitude
       {
         return db;
       }
-#endif
 
       /** \brief Evaluate any regular expression-based pattern.
        *
@@ -406,15 +380,7 @@ namespace aptitude
       {
 	try
 	  {
-#ifdef HAVE_EPT_TEXTSEARCH
-	    db.reset(new ept::textsearch::TextSearch);
-#else
-#ifdef HAVE_EPT_AXI
-            db.reset(new Xapian::Database(ept::axi::path_db()));
-#else
-#error "Can't figure out how to create the debtags database."
-#endif
-#endif
+            db.reset(new Xapian::Database("/var/lib/apt-xapian-index/index"));
 	  }
 	catch(...)
 	  {
@@ -907,8 +873,9 @@ namespace aptitude
 
 	    {
 	      pkgCache::VerIterator ver(target.get_version_iterator(cache));
-              if(p->get_architecture_architecture().empty() == true ||
-		 p->get_architecture_architecture() == ver.Arch())
+              const ref_ptr<arch_specification> spec(p->get_architecture_arch_specification());
+
+              if(spec->matches(ver.Arch()) == true)
                 return match::make_atomic(p, ver.Arch());
               else
                 return NULL;
@@ -1631,29 +1598,20 @@ namespace aptitude
 	    {
 	      pkgCache::PkgIterator pkg(target.get_package_iterator(cache));
 
-#ifdef HAVE_EPT
               using aptitude::apt::get_fullname;
 	      using aptitude::apt::get_tags;
               using aptitude::apt::tag;
-#endif
 
-#ifdef HAVE_EPT
-	      const std::set<tag> realTags(get_tags(pkg));
-	      const std::set<tag> * const tags(&realTags);
-#else
-	      const std::set<tag> * const tags(get_tags(pkg));
-#endif
+	      const std::set<tag> tags(get_tags(pkg));
 
-	      if(tags == NULL)
+	      if(tags.empty() == true)
 		return NULL;
 
-	      for(std::set<tag>::const_iterator i=tags->begin(); i!=tags->end(); ++i)
+	      for(std::set<tag>::const_iterator i = tags.begin();
+                  i != tags.end();
+                  ++i)
 		{
-#ifdef HAVE_EPT
 		  std::string name(get_fullname(*i));
-#else
-		  const std::string name = i->str().c_str();
-#endif
 		  ref_ptr<match> rval =
 		    evaluate_regexp(p,
 				    p->get_tag_regex_info(),
@@ -3082,7 +3040,7 @@ namespace aptitude
 
     void search(const ref_ptr<pattern> &p,
 		const ref_ptr<search_cache> &search_info,
-		std::vector<std::pair<pkgCache::PkgIterator, ref_ptr<structural_match> > > &matches,
+		pkg_results_list &matches,
 		aptitudeDepCache &cache,
 		pkgRecords &records,
                 bool debug,
@@ -3193,7 +3151,7 @@ namespace aptitude
 
     void search_versions(const ref_ptr<pattern> &p,
                          const ref_ptr<search_cache> &search_info,
-                         std::vector<std::pair<pkgCache::VerIterator, ref_ptr<structural_match> > > &matches,
+                         ver_results_list &matches,
                          aptitudeDepCache &cache,
                          pkgRecords &records,
                          bool debug,
diff --git a/src/generic/apt/matching/match.h b/src/generic/apt/matching/match.h
index 8be78aa8..c4fe77ba 100644
--- a/src/generic/apt/matching/match.h
+++ b/src/generic/apt/matching/match.h
@@ -47,6 +47,12 @@ namespace aptitude
 
   namespace matching
   {
+    class structural_match;
+    typedef std::vector< std::pair< pkgCache::PkgIterator,
+                                    cwidget::util::ref_ptr<structural_match> > > pkg_results_list;
+    typedef std::vector< std::pair< pkgCache::VerIterator,
+                                    cwidget::util::ref_ptr<structural_match> > > ver_results_list;
+
     /** \brief Represents the atomic values that are selected by search
      *  patterns.
      *
@@ -120,8 +126,6 @@ namespace aptitude
       }
     };
 
-    class structural_match;
-
     /** \brief Represents information about how a package was matched.
      *
      *  This only represents the information that can't be derived
@@ -703,7 +707,7 @@ namespace aptitude
      */
     void search(const cwidget::util::ref_ptr<pattern> &p,
 		const cwidget::util::ref_ptr<search_cache> &search_info,
-		std::vector<std::pair<pkgCache::PkgIterator, cwidget::util::ref_ptr<structural_match> > > &matches,
+		pkg_results_list &matches,
 		aptitudeDepCache &cache,
 		pkgRecords &records,
 		bool debug = false,
@@ -727,7 +731,7 @@ namespace aptitude
      */
     void search_versions(const cwidget::util::ref_ptr<pattern> &p,
                          const cwidget::util::ref_ptr<search_cache> &search_info,
-                         std::vector<std::pair<pkgCache::VerIterator, cwidget::util::ref_ptr<structural_match> > > &matches,
+                         ver_results_list &matches,
                          aptitudeDepCache &cache,
                          pkgRecords &records,
                          bool debug = false,
diff --git a/src/generic/apt/matching/pattern.cc b/src/generic/apt/matching/pattern.cc
index 5743a2a7..56cea314 100644
--- a/src/generic/apt/matching/pattern.cc
+++ b/src/generic/apt/matching/pattern.cc
@@ -71,6 +71,17 @@ namespace aptitude
       return 0 == regexec(&r, s, num_matches, matches, eflags);
     }
 
+    arch_specification::arch_specification(const std::string &_spec)
+      : pams(_spec),
+        spec(_spec)
+    {
+    }
+
+    bool arch_specification::matches(const char * const &arch)
+    {
+      return pams(arch);
+    }
+
     cwidget::util::ref_ptr<pattern>
     pattern::make_action(const action_type act)
     {
diff --git a/src/generic/apt/matching/pattern.h b/src/generic/apt/matching/pattern.h
index 5aad42f8..b1870acd 100644
--- a/src/generic/apt/matching/pattern.h
+++ b/src/generic/apt/matching/pattern.h
@@ -33,6 +33,8 @@
 #include <sys/types.h>
 
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cachefilter.h>
+
 
 namespace aptitude
 {
@@ -55,6 +57,28 @@ namespace aptitude
       std::string errmsg() const;
     };
 
+    /** \brief Ref-counted wrapper for PackageArchitectureMatchesSpecification.
+     */
+    class arch_specification : public util::refcounted_base_threadsafe
+    {
+      APT::CacheFilter::PackageArchitectureMatchesSpecification pams;
+      const std::string spec;
+
+    public:
+      arch_specification(const std::string &_spec);
+
+      bool matches(const char * const &arch);
+      inline bool matches(const pkgCache::VerIterator &ver)
+      {
+        return matches(ver.Arch());
+      }
+
+      inline const std::string &get_specification() const
+      {
+        return spec;
+      }
+    };
+
     /** \brief C++ wrapper for regular expression objects.
      *
      *  This class turns compilation errors into exceptions and
@@ -238,11 +262,12 @@ namespace aptitude
 	   *  Fields: pattern.
 	   */
 	  any_version,
-          /** \brief ?architecture(PATTERN)
+          /** \brief ?architecture(SPECIFICATION)
            *
-           *  Matches packages by their architecture.
+           *  Matches packages whose architecture meets the given
+           *  SPECIFICATION string (see Debian Policy section 11.1).
            *
-           *  Fields: regex_info.
+           *  Fields: arch_specification.
            */
           architecture,
 	  /** \brief ?automatic
@@ -669,6 +694,8 @@ namespace aptitude
       // to the action match information.
       std::string string_info;
 
+      cwidget::util::ref_ptr<arch_specification> arch_spec;
+
       // Groups several POD values that aren't used simultaneously.
       union
       {
@@ -804,6 +831,14 @@ namespace aptitude
 	info.multiarch = multiarch_type;
       }
 
+      // Allocate a pattern that has an architecture specification.
+      pattern(type _tp,
+              const cwidget::util::ref_ptr<arch_specification> &spec)
+        : tp(_tp),
+          arch_spec(spec)
+      {
+      }
+
     public:
 
       /** \name archive term constructor and accessors. */
@@ -907,19 +942,21 @@ namespace aptitude
 
       /** \brief Create an ?architecture term.
        *
-       *  \param arch  The architecture to match.
+       *  \param spec  The architecture specification string to match.
        */
       static cwidget::util::ref_ptr<pattern>
-      make_architecture(const std::string &arch)
+      make_architecture(const std::string &spec)
       {
-        return new pattern(architecture, arch);
+        return new pattern(architecture,
+                           new arch_specification(spec));
       }
 
-      const std::string &get_architecture_architecture() const
+      const cwidget::util::ref_ptr<arch_specification> &
+      get_architecture_arch_specification() const
       {
         eassert(tp == architecture);
 
-        return string_info;
+        return arch_spec;
       }
 
       // @}
diff --git a/src/generic/apt/matching/serialize.cc b/src/generic/apt/matching/serialize.cc
index 428bc30c..ea506b1f 100644
--- a/src/generic/apt/matching/serialize.cc
+++ b/src/generic/apt/matching/serialize.cc
@@ -254,7 +254,7 @@ namespace aptitude
 
 	  case pattern::architecture:
 	    out << "?architecture(";
-	    serialize_string(p->get_architecture_architecture(), out);
+	    serialize_string(p->get_architecture_arch_specification()->get_specification(), out);
 	    out.put(')');
 	    break;
 
diff --git a/src/generic/apt/pkg_changelog.cc b/src/generic/apt/pkg_changelog.cc
index 9b1caf33..192d3e56 100644
--- a/src/generic/apt/pkg_changelog.cc
+++ b/src/generic/apt/pkg_changelog.cc
@@ -39,6 +39,8 @@
 #include <sigc++/bind.h>
 
 #include <apt-pkg/sourcelist.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/strutl.h>
 
 #include <cwidget/generic/util/ssprintf.h>
 
@@ -83,15 +85,89 @@ namespace aptitude
       }
     }
 
+    std::string get_changelog_uri(const std::string &path)
+    {
+      string server = _config->Find("APT::Changelogs::Server",
+                                    "http://packages.debian.org/changelogs");
+
+      return cw::util::ssprintf("%s/%s/changelog",
+                                server.c_str(),
+                                path.c_str());
+    }
+
+    /* Construct a changelog file path for third party sites that do
+     * not use packages.debian.org/changelogs
+     * This simply uses the ArchiveURI() of the source pkg and looks for
+     * a .changelog file there.
+     */
+    bool guess_third_party_changelog_uri(pkgCache::VerIterator ver,
+                                         const std::string &path,
+                                         std::string &out_uri)
+    {
+      // guess uri for third-party packages
+      pkgCache::VerFileIterator vf = ver.FileList();
+      pkgCache::PkgFileIterator pf = vf.File();
+      pkgIndexFile *index;
+      if(apt_source_list->FindIndex(pf, index) == false)
+        return false;
+
+      out_uri = index->ArchiveURI(path + ".changelog");
+      return true;
+    }
+
     boost::shared_ptr<changelog_info>
     changelog_info::create(const std::string &source_package,
 			   const std::string &source_version,
-			   const std::string &section,
+                           const std::vector<std::string> &uri_list,
 			   const std::string &display_name)
     {
       return boost::make_shared<changelog_info>(source_package,
 						source_version,
-						section,
+                                                uri_list,
+						display_name);
+    }
+
+    boost::shared_ptr<changelog_info>
+    changelog_info::guess(const std::string &source_package,
+			  const std::string &source_version,
+                          const std::string &section,
+			  const std::string &display_name)
+    {
+      string realsection;
+      const string::size_type slashfound = section.find('/');
+      if(slashfound != section.npos)
+        realsection.assign(section, 0, slashfound);
+      else
+        realsection.assign("main");
+
+      string prefix;
+      if(source_package.size() > 3
+         && source_package.compare(0, 3, "lib") == 0)
+        prefix.assign(source_package, 0, 4);
+      else
+        prefix.assign(source_package, 0, 1);
+
+      string realver = StripEpoch(source_version);
+
+      vector<string> uri_list;
+
+      string path;
+      path = cw::util::ssprintf("pool/%s/%s/%s/%s_%s",
+                                realsection.c_str(),
+                                prefix.c_str(),
+                                source_package.c_str(),
+                                source_package.c_str(),
+                                realver.c_str());
+
+      uri_list.push_back(get_changelog_uri(path));
+
+      LOG_TRACE(Loggers::getAptitudeChangelog(),
+		"Getting the changelog of the source package "
+		<< source_package << " " << source_version);
+
+      return boost::make_shared<changelog_info>(source_package,
+						source_version,
+                                                uri_list,
 						display_name);
     }
 
@@ -117,6 +193,18 @@ namespace aptitude
       const string source_version =
 	rec.SourceVer().empty() ? ver.VerStr() : rec.SourceVer();
 
+      string path;
+      path = flNotFile(rec.FileName());
+      path += source_package + "_" + StripEpoch(source_version);
+
+      vector<string> uri_list;
+
+      uri_list.push_back(get_changelog_uri(path));
+
+      string third_party_uri;
+      if(guess_third_party_changelog_uri(ver, path, third_party_uri))
+        uri_list.push_back(third_party_uri);
+
       LOG_TRACE(Loggers::getAptitudeChangelog(),
 		"For " << ver.ParentPkg().Name()
 		<< " " << ver.VerStr() << ", getting the changelog of the source package "
@@ -124,7 +212,7 @@ namespace aptitude
 
       return boost::make_shared<changelog_info>(source_package,
 						source_version,
-						ver.Section(),
+                                                uri_list,
 						ver.ParentPkg().Name());
     }
 
@@ -385,8 +473,6 @@ namespace aptitude
 		   << req.get_info()->get_source_package()
 		   << ", source_version = "
 		   << req.get_info()->get_source_version()
-		   << ", section = "
-		   << req.get_info()->get_section()
 		   << ", display_name = "
 		   << req.get_info()->get_display_name()
 		   << ", download = 0x"
@@ -436,7 +522,7 @@ namespace aptitude
 
 	  const string source_package(info.get_source_package());
 	  const string source_version(info.get_source_version());
-	  const string section(info.get_section());
+          const vector<string> uri_list(info.get_uri_list());
 	  const string name(info.get_display_name());
 	  const string short_description = cw::util::ssprintf(_("Changelog of %s"), name.c_str());
 
@@ -520,40 +606,17 @@ namespace aptitude
 		      }
 		}
 
-	      string realsection;
-
-	      if(section.find('/') != section.npos)
-		realsection.assign(section, 0, section.find('/'));
-	      else
-		realsection.assign("main");
-
-	      string prefix;
-
-	      if(source_package.size() > 3 &&
-		 source_package[0] == 'l' && source_package[1] == 'i' && source_package[2] == 'b')
-		prefix = std::string("lib") + source_package[3];
-	      else
-		prefix = source_package[0];
-
-	      string realver;
-
-	      if(source_version.find(':') != source_version.npos)
-		realver.assign(source_version, source_version.find(':') + 1, source_version.npos);
-	      else
-		realver = source_version;
-
-	      string uri = cw::util::ssprintf("http://packages.debian.org/changelogs/pool/%s/%s/%s/%s_%s/changelog",
-					      realsection.c_str(),
-					      prefix.c_str(),
-					      source_package.c_str(),
-					      source_package.c_str(),
-					      realver.c_str());
-	      LOG_TRACE(logger,
-			"Adding " << uri
-			<< " as a URI for the changelog of " << source_package << " " << source_version);
-
-	      download.push_back(uri);
-
+              for(vector<string>::const_iterator uri = uri_list.begin();
+                  uri != uri_list.end();
+                  ++uri)
+                {
+                  LOG_TRACE(logger,
+                            "Adding " << (*uri)
+                            << " as a URI for the changelog of " << source_package
+                            << " " << source_version);
+
+                  download.push_back(*uri);
+                }
 
 	      LOG_TRACE(logger,
 			"Starting to download " << short_description);
diff --git a/src/generic/apt/pkg_changelog.h b/src/generic/apt/pkg_changelog.h
index c79407f5..cf4ffa55 100644
--- a/src/generic/apt/pkg_changelog.h
+++ b/src/generic/apt/pkg_changelog.h
@@ -56,7 +56,7 @@ namespace aptitude
     {
       const std::string source_package;
       const std::string source_version;
-      const std::string section;
+      const std::vector<std::string> uri_list;
       const std::string display_name;
 
     public:
@@ -66,11 +66,11 @@ namespace aptitude
        */
       changelog_info(const std::string &_source_package,
 		     const std::string &_source_version,
-		     const std::string &_section,
+                     const std::vector<std::string> &_uri_list,
 		     const std::string &_display_name)
 	: source_package(_source_package),
 	  source_version(_source_version),
-	  section(_section),
+          uri_list(_uri_list),
 	  display_name(_display_name)
       {
       }
@@ -78,9 +78,15 @@ namespace aptitude
       static boost::shared_ptr<changelog_info>
       create(const std::string &source_package,
 	     const std::string &source_version,
-	     const std::string &section,
+             const std::vector<std::string> &uri_list,
 	     const std::string &display_name);
 
+      static boost::shared_ptr<changelog_info>
+      guess(const std::string &source_package,
+	    const std::string &source_version,
+            const std::string &section,
+	    const std::string &display_name);
+
       /** \brief Create a changelog_info structure that describes the
        *  changelog of the given package version.
        *
@@ -94,8 +100,8 @@ namespace aptitude
       const std::string &get_source_package() const { return source_package; }
       /** \brief Retrieve the name of the changelog's source version. */
       const std::string &get_source_version() const { return source_version; }
-      /** \brief Retrieve the section that the package is in. */
-      const std::string &get_section() const { return section; }
+      /** \brief Retrieve the list of URIs to try, in order. */
+      const std::vector<std::string> &get_uri_list() const { return uri_list; }
       /** \brief Retrieve the display name of the changelog's package.
        *
        *  This is the name that should be displayed to the user when,
diff --git a/src/generic/apt/tags.cc b/src/generic/apt/tags.cc
index e41dea46..f0d482b0 100644
--- a/src/generic/apt/tags.cc
+++ b/src/generic/apt/tags.cc
@@ -30,7 +30,7 @@
 #include <map>
 #include <utility>
 
-#include <ctype.h>
+#include <cctype>
 #include <string.h>
 
 #include <sigc++/functors/mem_fun.h>
@@ -42,71 +42,69 @@
 #include <cwidget/generic/util/eassert.h>
 
 using namespace std;
+using aptitude::apt::tag;
 
-tag::tag(std::string::const_iterator start,
-	 std::string::const_iterator finish)
+class tag_list
 {
-  while(start != finish && isspace(*start))
-    ++start;
-
-  while(start != finish && isspace(*(finish-1)))
-    --finish;
+  // The string to parse.
+  std::string s;
+public:
+  class const_iterator
+  {
+    std::string::const_iterator start, finish, limit;
+  public:
+    const_iterator(const std::string::const_iterator &_start,
+		   const std::string::const_iterator &_finish,
+		   const std::string::const_iterator &_limit)
+      :start(_start), finish(_finish), limit(_limit)
+    {
+    }
 
-  s.assign(start, finish);
-}
+    const_iterator operator=(const const_iterator &other)
+    {
+      start = other.start;
+      finish = other.finish;
+      limit = other.limit;
 
-tag::const_iterator &tag::const_iterator::operator++()
-{
-  start = finish;
-  while(start != limit && (*start)==':')
-    ++start;
+      return *this;
+    }
 
-  if(start == limit)
-    finish = limit;
-  else
+    bool operator==(const const_iterator &other)
     {
-      finish = start+1;
-      while(finish != limit && (*finish) != ':')
-	++finish;
+      return other.start == start && other.finish == finish && other.limit == limit;
     }
 
-  return *this;
-}
+    bool operator!=(const const_iterator &other)
+    {
+      return other.start != start || other.finish != finish || other.limit != limit;
+    }
 
-tag::const_iterator tag::begin() const
-{
-  tag::const_iterator rval(s.begin(), s.begin(), s.end());
+    const_iterator &operator++();
 
-  ++rval;
+    tag operator*()
+    {
+      return tag(start, finish);
+    }
+  };
 
-  return rval;
-}
+  tag_list(const char *start, const char *finish)
+    :s(start, finish)
+  {
+  }
 
-int tag::cmp(const tag &other) const
-{
-  const_iterator myT=begin(), otherT=other.begin();
+  tag_list &operator=(const tag_list &other)
+  {
+    s=other.s;
 
-  while(myT != end() && otherT != other.end())
-    {
-      // ew, rather slow
-      if(lexicographical_compare(myT.start, myT.finish,
-				 otherT.start, otherT.finish))
-	return -1;
-      else if(lexicographical_compare(otherT.start, otherT.finish,
-				      myT.start, myT.finish))
-	return 1;
-
-      ++myT;
-      ++otherT;
-    }
+    return *this;
+  }
 
-  if(otherT != other.end())
-    return -1;
-  else if(myT != end())
-    return 1;
-  else
-    return 0;
-}
+  const_iterator begin() const;
+  const_iterator end() const
+  {
+    return const_iterator(s.end(), s.end(), s.end());
+  }
+};
 
 tag_list::const_iterator &tag_list::const_iterator::operator++()
 {
@@ -118,6 +116,9 @@ tag_list::const_iterator &tag_list::const_iterator::operator++()
   if(start != limit) // Push past the comma.
     ++start;
 
+  while(start != limit && isspace(*start))
+    ++start;
+
   if(start == limit)
     finish = limit;
   else
@@ -148,10 +149,20 @@ typedef set<tag> db_entry;
 // to provide a progress bar to the user.
 db_entry *tagDB;
 
+static void insert_tags(std::set<tag> &tags,
+                        const char *start,
+                        const char *finish)
+{
+  const tag_list lst(start, finish);
+
+  for(tag_list::const_iterator t=lst.begin(); t!=lst.end(); ++t)
+    tags.insert(*t);
+}
+
 static void insert_tags(const pkgCache::VerIterator &ver,
 			const pkgCache::VerFileIterator &vf)
 {
-  set<tag> *tags = tagDB + ver.ParentPkg()->ID;
+  set<tag> *tags = tagDB + ver.ParentPkg().Group()->ID;
 
   const char *recstart=0, *recend=0;
   const char *tagstart, *tagend;
@@ -169,10 +180,7 @@ static void insert_tags(const pkgCache::VerIterator &ver,
   if(!sec.Find("Tag", tagstart, tagend))
     return;
 
-  tag_list lst(tagstart, tagend);
-
-  for(tag_list::const_iterator t=lst.begin(); t!=lst.end(); ++t)
-    tags->insert(*t);
+  insert_tags((*tags), tagstart, tagend);
 }
 
 static void reset_tags()
@@ -181,16 +189,69 @@ static void reset_tags()
   tagDB = NULL;
 }
 
-const set<tag> *get_tags(const pkgCache::PkgIterator &pkg)
+const std::set<tag> aptitude::apt::get_tags(const pkgCache::PkgIterator &pkg)
 {
   if(!apt_cache_file || !tagDB)
-    return NULL;
+    return std::set<tag>();
+
+  return tagDB[pkg.Group()->ID];
+}
+
+static bool read_debtags_package_tags(OpProgress *progress,
+                                      const std::string &filename)
+{
+  FileFd F(filename, FileFd::ReadOnly);
+
+  if(!F.IsOpen())
+    {
+      // _error->Warning(_("Unable to load debtags package tags, perhaps"
+      //                   " debtags is not installed?"));
+      // Fail silently; debtags need not be installed.
+      return false;
+    }
 
-  return tagDB + pkg->ID;
+  const unsigned long m = (*apt_cache_file)->Head().GroupCount;
+  unsigned long n = 0;
+
+  if(progress != NULL)
+    progress->OverallProgress(0, m, 1,
+                             _("Building tag database"));
+
+  const unsigned long long buf_size = 4096;
+  char buf[buf_size];
+  while(F.ReadLine(buf, buf_size) != NULL)
+    {
+      if(progress != NULL)
+        progress->OverallProgress(++n, m, 1,
+                                  _("Building tag database"));
+
+      const char *sep = strstr(buf, ": ");
+      if(sep == NULL)
+        continue;
+
+      const string pkg_name(buf, sep - buf);
+      const pkgCache::GrpIterator grp((*apt_cache_file)->FindGrp(pkg_name));
+      if(grp.end() == true)
+        continue;
+
+      set<tag> *tags = tagDB + grp->ID;
+
+      const char *tagstart = sep + 2;
+      const char *tagend = tagstart;
+      while((*tagend) != '\0')
+        ++tagend;
+
+      insert_tags((*tags), tagstart, tagend);
+    }
+
+  if(progress != NULL)
+    progress->Done();
+
+  return true;
 }
 
 bool initialized_reset_signal;
-void load_tags(OpProgress &progress)
+void aptitude::apt::load_tags(OpProgress *progress)
 {
   eassert(apt_cache_file && apt_package_records);
 
@@ -201,8 +262,17 @@ void load_tags(OpProgress &progress)
       initialized_reset_signal = true;
     }
 
-  tagDB = new db_entry[(*apt_cache_file)->Head().PackageCount];
+  tagDB = new db_entry[(*apt_cache_file)->Head().GroupCount];
 
+  // Try to load from the debtags database
+  {
+    const string filename(aptcfg->FindFile("Debtags::Package-Tags",
+                                           "/var/lib/debtags/package-tags"));
+    if(read_debtags_package_tags(progress, filename) == true)
+      return;
+  }
+
+  // Otherwise fall back to reading the Packages files directly
   std::vector<loc_pair> verfiles;
 
   for(pkgCache::PkgIterator p = (*apt_cache_file)->PkgBegin();
@@ -214,23 +284,24 @@ void load_tags(OpProgress &progress)
 
   sort(verfiles.begin(), verfiles.end(), location_compare());
 
-  progress.OverallProgress(0, verfiles.size(), 1,
-			   _("Building tag database"));
+  if(progress != NULL)
+    progress->OverallProgress(0, verfiles.size(), 1,
+                             _("Building tag database"));
   size_t n=0;
   for(std::vector<loc_pair>::iterator i=verfiles.begin();
       i!=verfiles.end(); ++i)
     {
       insert_tags(i->first, i->second);
       ++n;
-      progress.OverallProgress(n, verfiles.size(), 1, _("Building tag database"));
+      if(progress != NULL)
+        progress->OverallProgress(n, verfiles.size(), 1,
+                                  _("Building tag database"));
     }
 
-  progress.Done();
+  if(progress != NULL)
+    progress->Done();
 }
 
-
-
-
 // TAG VOCABULARY FILE
 typedef map<string, string> facet_description_map;
 typedef map<string, string> tag_description_map;
@@ -285,10 +356,12 @@ static void init_vocabulary()
     }
 }
 
-string facet_description(const std::string &facet)
+std::string aptitude::apt::get_facet_long_description(const tag &t)
 {
   init_vocabulary();
 
+  const string facet(get_facet_name(t));
+
   facet_description_map::const_iterator found =
     facet_descriptions->find(facet);
 
@@ -298,12 +371,20 @@ string facet_description(const std::string &facet)
     return found->second;
 }
 
-string tag_description(const std::string &tag)
+// FIXME: This code to split long/short descriptions is repeated in
+// too many places.
+std::string aptitude::apt::get_facet_short_description(const tag &t)
+{
+  const string desc(get_facet_long_description(t));
+  return string(desc, 0, desc.find('\n'));
+}
+
+std::string aptitude::apt::get_tag_long_description(const tag &t)
 {
   init_vocabulary();
 
   tag_description_map::const_iterator found =
-    tag_descriptions->find(tag);
+    tag_descriptions->find(t);
 
   if(found == tag_descriptions->end())
     return string();
@@ -311,6 +392,12 @@ string tag_description(const std::string &tag)
     return found->second;
 }
 
+std::string aptitude::apt::get_tag_short_description(const tag &t)
+{
+  const string desc = get_tag_long_description(t);
+  return string(desc, 0, desc.find('\n'));
+}
+
 #else // HAVE_EPT
 
 #if defined(HAVE_EPT_DEBTAGS_VOCABULARY_FACET_DATA) || defined(HAVE_EPT_DEBTAGS_VOCABULARY_TAG_DATA)
@@ -349,7 +436,7 @@ namespace aptitude
     }
 
     bool initialized_reset_signal;
-    void load_tags()
+    void load_tags(OpProgress *progress)
     {
       if(!initialized_reset_signal)
 	{
@@ -392,37 +479,6 @@ namespace aptitude
 	}
     }
 
-    std::string get_facet_name(const tag &t)
-    {
-      const std::string name = get_fullname(t);
-      std::size_t split_pos = name.find("::");
-      if(split_pos == std::string::npos)
-        return _("legacy");
-      else
-        return std::string(name, 0, split_pos);
-    }
-
-    std::string get_tag_name(const tag &t)
-    {
-      const std::string name = get_fullname(t);
-      std::size_t split_pos = name.find("::");
-      if(split_pos == std::string::npos)
-        return name;
-      else
-        return std::string(name, split_pos + 2);
-    }
-
-#ifdef HAVE_EPT_DEBTAGS_FACET_DESCRIPTION
-    std::string get_facet_long_description(const tag &t)
-    {
-      return t.facet().longDescription();
-    }
-
-    std::string get_facet_short_description(const tag &t)
-    {
-      return t.facet().shortDescription();
-    }
-#else
 #ifdef HAVE_EPT_DEBTAGS_VOCABULARY_FACET_DATA
     std::string get_facet_long_description(const tag &t)
     {
@@ -456,19 +512,7 @@ namespace aptitude
 #else
 #error "Don't know how to retrieve facet descriptions."
 #endif
-#endif
 
-#ifdef HAVE_EPT_DEBTAGS_TAG_DESCRIPTION
-    std::string get_tag_long_description(const tag &t)
-    {
-      return t.longDescription();
-    }
-
-    std::string get_tag_short_description(const tag &t)
-    {
-      return t.shortDescription();
-    }
-#else
 #ifdef HAVE_EPT_DEBTAGS_VOCABULARY_TAG_DATA
     std::string get_tag_long_description(const tag &t)
     {
@@ -502,8 +546,33 @@ namespace aptitude
 #else
 #error "Don't know how to retrieve tag descriptions."
 #endif
-#endif
   }
 }
 
 #endif // HAVE_EPT
+
+namespace aptitude
+{
+  namespace apt
+  {
+    std::string get_facet_name(const tag &t)
+    {
+      const std::string name = get_fullname(t);
+      std::size_t split_pos = name.find("::");
+      if(split_pos == std::string::npos)
+        return _("legacy");
+      else
+        return std::string(name, 0, split_pos);
+    }
+
+    std::string get_tag_name(const tag &t)
+    {
+      const std::string name = get_fullname(t);
+      std::size_t split_pos = name.find("::");
+      if(split_pos == std::string::npos)
+        return name;
+      else
+        return std::string(name, split_pos + 2);
+    }
+  }
+}
diff --git a/src/generic/apt/tags.h b/src/generic/apt/tags.h
index d4d5171c..c4f27e8b 100644
--- a/src/generic/apt/tags.h
+++ b/src/generic/apt/tags.h
@@ -25,222 +25,30 @@
 #include <config.h>
 #endif
 
-// If ept is unavailable, we use our own (broken!) code to build an
-// in-memory database of package tags.  Otherwise, this code just
-// handles initializing it, destroying it, and extracting information
-// from it.  Note that this means that all callers have to be
-// conditionalized on HAVE_EPT: the "tag" class this used to return is
-// broken wrt hierarchies and just using ept is simpler.
+#ifdef HAVE_EPT
+#include <ept/debtags/debtags.h>
+#endif // HAVE_EPT
 
-#ifndef HAVE_EPT
+#include <apt-pkg/pkgcache.h>
 
 #include <set>
 #include <string>
 
-#include <apt-pkg/pkgcache.h>
-
-/** \brief A parser for tags.
- * 
- *  \file tags.h
- */
+#ifndef HAVE_EPT
+#define DEBTAGS_ARE_STRINGS 1
+#else
+#ifdef EPT_DEBTAGS_GETTAGSOFITEM_RETURNS_STRINGS
+#define DEBTAGS_ARE_STRINGS 1
+#endif
+#endif
 
 class OpProgress;
 
-class tag
-{
-  std::string s;
-
-  int cmp(const tag &other) const;
-public:
-  class const_iterator
-  {
-    std::string::const_iterator start, finish, limit;
-
-    friend class tag;
-  public:
-    const_iterator(const std::string::const_iterator &_start,
-		   const std::string::const_iterator &_finish,
-		   const std::string::const_iterator &_limit)
-      :start(_start), finish(_finish), limit(_limit)
-    {
-    }
-
-    const_iterator &operator++();
-
-    const_iterator &operator=(const const_iterator &other)
-    {
-      start = other.start;
-      finish = other.finish;
-      limit = other.limit;
-
-      return *this;
-    }
-
-    bool operator==(const const_iterator &other) const
-    {
-      return start == other.start && finish == other.finish && limit == other.limit;
-    }
-
-    bool operator!=(const const_iterator &other) const
-    {
-      return start != other.start || finish != other.finish || limit != other.limit;
-    }
-
-    std::string operator*() const
-    {
-      return std::string(start, finish);
-    }
-  };
-
-  tag(std::string::const_iterator _start,
-      std::string::const_iterator _finish);
-
-  tag &operator=(const tag &other)
-  {
-    s = other.s;
-
-    return *this;
-  }
-
-  bool operator<(const tag &other) const
-  {
-    return cmp(other) < 0;
-  }
-
-  bool operator<=(const tag &other) const
-  {
-    return cmp(other) <= 0;
-  }
-
-  bool operator==(const tag &other) const
-  {
-    return cmp(other) == 0;
-  }
-
-  bool operator!=(const tag &other) const
-  {
-    return cmp(other) != 0;
-  }
-
-  bool operator>(const tag &other) const
-  {
-    return cmp(other) > 0;
-  }
-
-  bool operator>=(const tag &other) const
-  {
-    return cmp(other) >= 0;
-  }
-
-  const_iterator begin() const;
-  const_iterator end() const
-  {
-    return const_iterator(s.end(), s.end(), s.end());
-  }
-
-  std::string str() const
-  {
-    return s;
-  }
-};
-
-class tag_list
-{
-  // The string to parse.
-  std::string s;
-public:
-  class const_iterator
-  {
-    std::string::const_iterator start, finish, limit;
-  public:
-    const_iterator(const std::string::const_iterator &_start,
-		   const std::string::const_iterator &_finish,
-		   const std::string::const_iterator &_limit)
-      :start(_start), finish(_finish), limit(_limit)
-    {
-    }
-
-    const_iterator operator=(const const_iterator &other)
-    {
-      start = other.start;
-      finish = other.finish;
-      limit = other.limit;
-
-      return *this;
-    }
-
-    bool operator==(const const_iterator &other)
-    {
-      return other.start == start && other.finish == finish && other.limit == limit;
-    }
-
-    bool operator!=(const const_iterator &other)
-    {
-      return other.start != start || other.finish != finish || other.limit != limit;
-    }
-
-    const_iterator &operator++();
-
-    tag operator*()
-    {
-      return tag(start, finish);
-    }
-  };
-
-  tag_list(const char *start, const char *finish)
-    :s(start, finish)
-  {
-  }
-
-  tag_list &operator=(const tag_list &other)
-  {
-    s=other.s;
-
-    return *this;
-  }
-
-  const_iterator begin() const;
-  const_iterator end() const
-  {
-    return const_iterator(s.end(), s.end(), s.end());
-  }
-};
-
-// Grab the tags for the given package:
-const std::set<tag> *get_tags(const pkgCache::PkgIterator &pkg);
-
-// Load tags for all packages (call before get_tags)
-void load_tags(OpProgress &progress);
-
-
-
-// Interface to the tag vocabulary file; tag vocabularies are assumed
-// to not change over time.
-std::string facet_description(const std::string &facet);
-
-// Here "Tag" is a fully qualified tag name.
-std::string tag_description(const std::string &tag);
-
-#else // HAVE_EPT
-
-#include <apt-pkg/pkgcache.h>
-
-#include <ept/debtags/debtags.h>
-
-#include <set>
-
 namespace aptitude
 {
   namespace apt
   {
-#ifdef HAVE_EPT_DEBTAGS_TAG
-    typedef ept::debtags::Tag tag;
-    inline std::string get_fullname(const tag &t)
-    {
-      return t.fullname();
-    }
-#else
-#ifdef EPT_DEBTAGS_GETTAGSOFITEM_RETURNS_STRINGS
+#ifdef DEBTAGS_ARE_STRINGS
     typedef std::string tag;
     inline std::string get_fullname(const std::string &t)
     {
@@ -251,12 +59,12 @@ namespace aptitude
     // configure checks can't recognize.
 #error "Don't know how to represent a debtags tag."
 #endif
-#endif
-
-    const std::set<tag> get_tags(const pkgCache::PkgIterator &pkg);
 
     /** \brief Initialize the cache of debtags information. */
-    void load_tags();
+    void load_tags(OpProgress *progress = NULL);
+
+    /** /brief Grab the tags for the given package. */
+    const std::set<tag> get_tags(const pkgCache::PkgIterator &pkg);
 
     /** \brief Get the name of the facet corresponding to a tag. */
     std::string get_facet_name(const tag &t);
@@ -284,6 +92,11 @@ namespace aptitude
   }
 }
 
-#endif // HAVE_EPT
+// If ept is unavailable, we use our own (broken!) code to build an
+// in-memory database of package tags.  Otherwise, this code just
+// handles initializing it, destroying it, and extracting information
+// from it.  Note that this means that all callers have to be
+// conditionalized on HAVE_EPT: the "tag" class this used to return is
+// broken wrt hierarchies and just using ept is simpler.
 
 #endif
diff --git a/src/generic/controllers/Makefile.in b/src/generic/controllers/Makefile.in
index 4f78f3fc..bd7092c3 100644
--- a/src/generic/controllers/Makefile.in
+++ b/src/generic/controllers/Makefile.in
@@ -194,6 +194,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/generic/problemresolver/Makefile.in b/src/generic/problemresolver/Makefile.in
index 7ec5046b..680bec6a 100644
--- a/src/generic/problemresolver/Makefile.in
+++ b/src/generic/problemresolver/Makefile.in
@@ -203,6 +203,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/generic/util/Makefile.in b/src/generic/util/Makefile.in
index e4eca1e7..d35de29d 100644
--- a/src/generic/util/Makefile.in
+++ b/src/generic/util/Makefile.in
@@ -233,6 +233,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/generic/util/mocks/Makefile.in b/src/generic/util/mocks/Makefile.in
index 5b194263..d5730e34 100644
--- a/src/generic/util/mocks/Makefile.in
+++ b/src/generic/util/mocks/Makefile.in
@@ -169,6 +169,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/generic/views/Makefile.in b/src/generic/views/Makefile.in
index e2e2a84e..c5217b56 100644
--- a/src/generic/views/Makefile.in
+++ b/src/generic/views/Makefile.in
@@ -231,6 +231,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/generic/views/mocks/Makefile.in b/src/generic/views/mocks/Makefile.in
index f92b75a7..09b0bd0f 100644
--- a/src/generic/views/mocks/Makefile.in
+++ b/src/generic/views/mocks/Makefile.in
@@ -193,6 +193,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/gtk/Makefile.in b/src/gtk/Makefile.in
index c55a0deb..6b41cdc2 100644
--- a/src/gtk/Makefile.in
+++ b/src/gtk/Makefile.in
@@ -271,6 +271,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/gtk/gui.cc b/src/gtk/gui.cc
index d44a8499..e846f6f2 100644
--- a/src/gtk/gui.cc
+++ b/src/gtk/gui.cc
@@ -956,6 +956,7 @@ namespace gui
 
       boost::shared_ptr<download_install_manager> m =
 	boost::make_shared<download_install_manager>(false,
+                                                     true,
 						     sigc::ptr_fun(&gui_run_dpkg));
 
       start_download(m,
@@ -1271,32 +1272,23 @@ namespace gui
     if(pkg.end())
       return where;
 
-#ifdef HAVE_EPT
     using aptitude::apt::get_fullname;
     using aptitude::apt::get_tags;
     using aptitude::apt::tag;
 
-    const std::set<tag> realS(get_tags(pkg));
-    const std::set<tag> * const s(&realS);
-#else
-    const std::set<tag> * const s(get_tags(pkg));
-#endif
+    const std::set<tag> s(get_tags(pkg));
 
-    if(s != NULL && !s->empty())
+    if(s->empty() == false)
       {
 	bool first = true;
 	where = buffer->insert_with_tag(where,
 					ssprintf(_("Tags of %s:\n"), pkg.Name()),
 					headerTag);
 	// TODO: indent all the tags.
-	for(std::set<tag>::const_iterator it = s->begin();
-	    it != s->end(); ++it)
+	for(std::set<tag>::const_iterator it = s.begin();
+	    it != s.end(); ++it)
 	  {
-#ifdef HAVE_EPT
 	    const std::string name(get_fullname(*it));
-#else
-	    const std::string name(it->str());
-#endif
 
 	    if(first)
 	      first = false;
diff --git a/src/gtk/pkgview.cc b/src/gtk/pkgview.cc
index 4f0a6741..c8fd0abc 100644
--- a/src/gtk/pkgview.cc
+++ b/src/gtk/pkgview.cc
@@ -514,7 +514,7 @@ namespace gui
 
     bool limited = limit.valid();
 
-    std::vector<std::pair<pkgCache::PkgIterator, ref_ptr<structural_match> > > matches;
+    pkg_results_list matches;
     ref_ptr<search_cache> search_info(search_cache::create());
     if(limited)
       {
@@ -523,8 +523,9 @@ namespace gui
 	int num = 0;
 	const int total = static_cast<int>(matches.size());
 
-	for(std::vector<std::pair<pkgCache::PkgIterator, ref_ptr<structural_match> > >::const_iterator
-	      it = matches.begin(); it != matches.end(); ++it)
+        for(pkg_results_list::const_iterator it = matches.begin();
+            it != matches.end();
+            ++it)
 	  {
 	    if(canceled->is_canceled())
 	      return;
diff --git a/src/gtk/toplevel/Makefile.in b/src/gtk/toplevel/Makefile.in
index a32d49bd..812a3b1c 100644
--- a/src/gtk/toplevel/Makefile.in
+++ b/src/gtk/toplevel/Makefile.in
@@ -192,6 +192,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/gtk/util/Makefile.in b/src/gtk/util/Makefile.in
index 9d2074e2..8b654cc1 100644
--- a/src/gtk/util/Makefile.in
+++ b/src/gtk/util/Makefile.in
@@ -184,6 +184,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/gtk/view-impls/Makefile.in b/src/gtk/view-impls/Makefile.in
index 8d4aa301..056d8937 100644
--- a/src/gtk/view-impls/Makefile.in
+++ b/src/gtk/view-impls/Makefile.in
@@ -192,6 +192,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/load_sortpolicy.cc b/src/load_sortpolicy.cc
index 895573fc..7ec9b26a 100644
--- a/src/load_sortpolicy.cc
+++ b/src/load_sortpolicy.cc
@@ -94,6 +94,21 @@ pkg_sortpolicy *parse_priority_policy(const arglist &args,
   return pkg_sortpolicy_priority(chain, reversed);
 }
 
+
+pkg_sortpolicy *parse_debsize_policy(const arglist &args,
+					 pkg_sortpolicy *chain,
+					 bool reversed)
+{
+  if(args.size()>0)
+    {
+      _error->Error(_("Sorting policy '%s' takes no arguments"), "debsize");
+      return NULL;
+    }
+
+  return pkg_sortpolicy_debsize(chain, reversed);
+}
+
+
 static parser_map parse_types;
 
 static void init_parse_types()
@@ -105,6 +120,7 @@ static void init_parse_types()
       parse_types["name"]=parse_name_policy;
       parse_types["version"] = parse_ver_policy;
       parse_types["installsize"]=parse_installsize_policy;
+      parse_types["debsize"]=parse_debsize_policy;
       parse_types["priority"]=parse_priority_policy;
       initted_parse_types=true;
     }
diff --git a/src/main.cc b/src/main.cc
index 511715aa..0dc89abd 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,7 @@
 // main.cc  (neé testscr.cc)
 //
-//  Copyright 1999-2011 Daniel Burrows
+//  Copyright (C) 1999-2011 Daniel Burrows
+//  Copyright (C) 2012 Daniel Hartwig
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
@@ -19,11 +20,6 @@
 //
 //  Tests the various screen-output mechanisms
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE // For getopt.h
-#endif
-
-#include <getopt.h>
 #include <signal.h>
 
 #include "aptitude.h"
@@ -79,6 +75,7 @@
 #include <sigc++/functors/ptr_fun.h>
 
 #include <apt-pkg/error.h>
+#include <apt-pkg/cmndline.h>
 #include <apt-pkg/init.h>
 
 #include <boost/format.hpp>
@@ -259,100 +256,69 @@ static void usage()
   printf(_("                  This aptitude does not have Super Cow Powers.\n"));
 }
 
-// This handles options with no single-character equivalent
-enum {
-  OPTION_VERSION = 1,
-  OPTION_VISUAL_PREVIEW,
-  OPTION_QUEUE_ONLY,
-  OPTION_PURGE_UNUSED,
-  OPTION_ALLOW_UNTRUSTED,
-  OPTION_NO_NEW_INSTALLS,
-  OPTION_NO_NEW_UPGRADES,
-  OPTION_ALLOW_NEW_INSTALLS,
-  OPTION_ALLOW_NEW_UPGRADES,
-  OPTION_ADD_USER_TAG,
-  OPTION_ADD_USER_TAG_TO,
-  OPTION_REMOVE_USER_TAG,
-  OPTION_REMOVE_USER_TAG_FROM,
-  OPTION_SAFE_RESOLVER,
-  OPTION_FULL_RESOLVER,
-  OPTION_SHOW_RESOLVER_ACTIONS,
-  OPTION_NO_SHOW_RESOLVER_ACTIONS,
-  OPTION_ARCH_ONLY,
-  OPTION_NOT_ARCH_ONLY,
-  OPTION_DISABLE_COLUMNS,
-  OPTION_GUI,
-  OPTION_NO_GUI,
-  OPTION_QT_GUI,
-  OPTION_NO_QT_GUI,
-  OPTION_LOG_LEVEL,
-  OPTION_LOG_FILE,
-  OPTION_LOG_CONFIG_FILE,
-  OPTION_LOG_RESOLVER,
-  OPTION_SHOW_SUMMARY,
-  OPTION_AUTOCLEAN_ON_STARTUP,
-  OPTION_CLEAN_ON_STARTUP,
-  OPTION_GROUP_BY,
-  OPTION_SHOW_PACKAGE_NAMES,
-  OPTION_NEW_GUI,
-};
-int getopt_result;
-
-option opts[]={
-  {"help", 0, NULL, 'h'},
-  {"version", 0, &getopt_result, OPTION_VERSION},
-  {"display-format", 1, NULL, 'F'},
-  {"quiet", 2, NULL, 'q'},
-  {"width", 1, NULL, 'w'},
-  {"simulate", 0, NULL, 's'},
-  {"allow-untrusted", 0, &getopt_result, OPTION_ALLOW_UNTRUSTED},
-  {"with-recommends", 0, NULL, 'r'},
-  {"without-recommends", 0, NULL, 'R'},
-  {"download-only", 0, NULL, 'd'},
-  {"assume-yes", 0, NULL, 'y'},
-  {"verbose", 0, NULL, 'v'},
-  {"show-versions", 0, NULL, 'V'},
-  {"show-deps", 0, NULL, 'D'},
-  {"show-why", 0, NULL, 'W'},
-  {"prompt", 0, NULL, 'P'},
-  {"sort", 1, NULL, 'O'},
-  {"target-release", 1, NULL, 't'},
-  {"disable-columns", 0, &getopt_result, OPTION_DISABLE_COLUMNS},
-  {"no-new-installs", 0, &getopt_result, OPTION_NO_NEW_INSTALLS},
-  {"no-new-upgrades", 0, &getopt_result, OPTION_NO_NEW_UPGRADES},
-  {"allow-new-installs", 0, &getopt_result, OPTION_ALLOW_NEW_INSTALLS},
-  {"allow-new-upgrades", 0, &getopt_result, OPTION_ALLOW_NEW_UPGRADES},
-  {"safe-resolver", 0, &getopt_result, OPTION_SAFE_RESOLVER},
-  {"full-resolver", 0, &getopt_result, OPTION_FULL_RESOLVER},
-  {"show-resolver-actions", 0, &getopt_result, OPTION_SHOW_RESOLVER_ACTIONS},
-  {"no-show-resolver-actions", 0, &getopt_result, OPTION_NO_SHOW_RESOLVER_ACTIONS},
-  {"visual-preview", 0, &getopt_result, OPTION_VISUAL_PREVIEW},
-  {"schedule-only", 0, &getopt_result, OPTION_QUEUE_ONLY},
-  {"purge-unused", 0, &getopt_result, OPTION_PURGE_UNUSED},
-  {"add-user-tag", 1, &getopt_result, OPTION_ADD_USER_TAG},
-  {"add-user-tag-to", 1, &getopt_result, OPTION_ADD_USER_TAG_TO},
-  {"remove-user-tag", 1, &getopt_result, OPTION_REMOVE_USER_TAG},
-  {"remove-user-tag-from", 1, &getopt_result, OPTION_REMOVE_USER_TAG_FROM},
-  {"arch-only", 0, &getopt_result, OPTION_ARCH_ONLY},
-  {"not-arch-only", 0, &getopt_result, OPTION_NOT_ARCH_ONLY},
+CommandLine::Args opts[] = {
+  {'h', "help", "help", 0},
+  {0, "version", "version", 0},
+  {'q', "quiet", "quiet", CommandLine::IntLevel},
+  {'F', "display-format", PACKAGE "::%::display-format", CommandLine::HasArg},
+  {'w', "width", PACKAGE "::CmdLine::Package-Display-Width", CommandLine::HasArg},
+  {'s', "simulate", PACKAGE "::Simulate", 0},
+  {'r', "with-recommends", "APT::Install-Recommends", 0},
+  {'R', "without-recommends", PACKAGE "::%::without-recommends", 0},
+  {0, "allow-untrusted", PACKAGE "::CmdLine::Ignore-Trust-Violations", 0},
+  {'d', "download-only", PACKAGE "::CmdLine::Download-Only", 0},
+  {'y', "yes", PACKAGE "::CmdLine::Assume-Yes", 0},
+  {'y', "assume-yes", PACKAGE "::CmdLine::Assume-Yes", 0},
+  {'v', "verbose", PACKAGE "::CmdLine::Verbose", CommandLine::IntLevel},
+  {'V', "show-versions", PACKAGE "::CmdLine::Show-Versions", 0},
+  {'D', "show-deps", PACKAGE "::CmdLine::Show-Deps", 0},
+  {'W', "show-why", PACKAGE "::CmdLine::Show-Why", 0},
+  {'P', "prompt", PACKAGE "::CmdLine::Always-Prompt", 0},
+  {'O', "sort", PACKAGE "::CmdLine::Sorting", CommandLine::HasArg},
+  {'t', "target-release", "APT::Default-Release", CommandLine::HasArg},
+  {'t', "default-release", "APT::Default-Release", CommandLine::HasArg},
+  {0, "disable-columns", PACKAGE "::CmdLine::Disable-Columns", 0},
+  {0, "no-new-installs", PACKAGE "::Safe-Resolver::No-New-Installs", 0},
+  {0, "no-new-upgrades", PACKAGE "::Safe-Resolver::No-New-Upgrades", 0},
+  {0, "allow-new-installs", PACKAGE "::Safe-Resolver::No-New-Installs", CommandLine::InvBoolean},
+  {0, "allow-new-upgrades", PACKAGE "::Safe-Resolver::No-New-Upgrades", CommandLine::InvBoolean},
+  {0, "safe-resolver", PACKAGE "::%::safe-resolver", CommandLine::Boolean},
+  {0, "full-resolver", PACKAGE "::%::full-resolver", CommandLine::Boolean},
+  {0, "show-resolver-actions", PACKAGE "::Safe-Resolver::Show-Resolver-Actions", 0},
+  {0, "visual-preview", PACKAGE "::CmdLine::Visual-Preview", 0},
+  {0, "schedule-only", PACKAGE "::CmdLine::Schedule-Only", 0},
+  {0, "purge-unused", PACKAGE "::Purge-Unused", 0},
+  {0, "add-user-tag", PACKAGE "::CmdLine::Add-User-Tag::", CommandLine::HasArg},
+  {0, "remove-user-tag", PACKAGE "::CmdLine::Remove-User-Tag::", CommandLine::HasArg},
+  {0, "add-user-tag-to", PACKAGE "::CmdLine::Add-User-Tag-To::", CommandLine::HasArg},
+  {0, "remove-user-tag-from", PACKAGE "::CmdLine::Remove-User-Tag-From::", CommandLine::HasArg},
+  {0, "arch-only", "APT::Get::Arch-Only", CommandLine::Boolean},
+  {0, "not-arch-only", "APT::Get::Arch-Only", CommandLine::InvBoolean},
 #ifdef HAVE_GTK
-  {"gui", 0, &getopt_result, OPTION_GUI},
+  {0, "gui", PACKAGE "::%::start-gui", CommandLine::Boolean},
+  {0, "new-gui", PACKAGE "::%::new-gui", 0},
 #endif
-  {"no-gui", 0, &getopt_result, OPTION_NO_GUI},
+  {0, "no-gui", PACKAGE "::%::start-gui", CommandLine::InvBoolean},
 #ifdef HAVE_QT
-  {"qt", 0, &getopt_result, OPTION_QT_GUI},
-  {"no-qt", 0, &getopt_result, OPTION_NO_QT_GUI},
+  {0, "qt", PACKAGE "::%::qt-gui", 0},
 #endif
-  {"log-level", 1, &getopt_result, OPTION_LOG_LEVEL},
-  {"log-file", 1, &getopt_result, OPTION_LOG_FILE},
-  {"log-config-file", 1, &getopt_result, OPTION_LOG_CONFIG_FILE},
-  {"log-resolver", 0, &getopt_result, OPTION_LOG_RESOLVER},
-  {"show-summary", 2, &getopt_result, OPTION_SHOW_SUMMARY},
-  {"autoclean-on-startup", 0, &getopt_result, OPTION_AUTOCLEAN_ON_STARTUP},
-  {"clean-on-startup", 0, &getopt_result, OPTION_CLEAN_ON_STARTUP},
-  {"group-by", 1, &getopt_result, OPTION_GROUP_BY},
-  {"show-package-names", 1, &getopt_result, OPTION_SHOW_PACKAGE_NAMES},
-  {"new-gui", 0, &getopt_result, OPTION_NEW_GUI},
+  {0, "log-level", PACKAGE "::Logging::Levels::", CommandLine::HasArg},
+  {0, "log-file", PACKAGE "::Logging::File", CommandLine::HasArg},
+  {0, "log-resolver", PACKAGE "::%::log-resolver", 0},
+  {0, "show-summary", PACKAGE "::CmdLine::Show-Summary",  CommandLine::HasArg},
+  {0, "autoclean-on-startup", PACKAGE "::UI::Autoclean-On-Startup", 0},
+  {0, "clean-on-startup", PACKAGE "::UI::Clean-On-Startup", 0},
+  {'u', "update-on-startup", PACKAGE "::UI::Update-On-Startup", 0},
+  {'i', "install-on-startup", PACKAGE "::UI::Install-On-Startup", 0},
+  {0, "group-by", PACKAGE "::CmdLine::Versions-Group-By", CommandLine::HasArg},
+  {0, "show-package-names", PACKAGE "::CmdLine::Versions-Show-Package-Names", CommandLine::HasArg},
+  {'f', "fix-broken", PACKAGE "::CmdLine::Fix-Broken", 0},
+  {'m', "ignore-missing", PACKAGE "::CmdLine::Fix-Missing", 0},
+  {0, "fix-missing", PACKAGE "::CmdLine::Fix-Missing", 0},
+  {'Z', "show-size-changes", PACKAGE "::CmdLine::Show-Size-Changes", 0},
+  {'S', "pkgstates", PACKAGE "::%::pkgstates.in", CommandLine::HasArg},
+  {'c', "config-file", 0, CommandLine::ConfigFile},
+  {'o', "option", 0, CommandLine::ArbItem},
   {0,0,0,0}
 };
 
@@ -476,7 +442,9 @@ namespace
       {
 	// ForTranslators: both the translated and the untranslated
 	// log level names are accepted here.
-	_error->Error(_("Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", \"warn\", \"error\", \"fatal\", or \"off\")."),
+        _error->Error(_("Unknown log level name \"%s\" (expected \"trace\","
+                        " \"debug\", \"info\", \"warn\", \"error\","
+                        " \"fatal\", or \"off\")."),
 		      level_name.c_str());
 	return;
       }
@@ -485,7 +453,7 @@ namespace
 
     if(!targetLogger)
       {
-	_error->Error(_("Invalid logger name \"%s\"."),
+	_error->Error(_("Invalid logger name \"%s\""),
 		      logger_name.c_str());
 	return;
       }
@@ -505,6 +473,35 @@ namespace
       apply_logging_level(item->Value);
   }
 
+  /** \brief Read the default set of user tag application requests. */
+  bool read_user_tag_applications(std::vector<aptitude::cmdline::tag_application> &user_tags)
+  {
+    struct tag_application_source
+    {
+      const char *config_item;
+      bool is_add;
+      bool implicit;
+    };
+
+    struct tag_application_source sources[] = {
+      {PACKAGE "::CmdLine::Add-User-Tag", true, true},
+      {PACKAGE "::CmdLine::Remove-User-Tag", false, true},
+      {PACKAGE "::CmdLine::Add-User-Tag-To", true, false},
+      {PACKAGE "::CmdLine::Remove-User-Tag-From", false, false},
+      {0,0,0}
+    };
+
+    using aptitude::cmdline::read_user_tag_applications;
+    for(size_t i = 0; sources[i].config_item != 0; ++i)
+      {
+        if(read_user_tag_applications(user_tags, sources[i].config_item,
+                                      sources[i].is_add, sources[i].implicit) == false)
+          return false;
+      }
+
+    return true;
+  }
+
   /** \brief Set some standard logging levels to output log
    *  information about the resolver.
    *
@@ -518,27 +515,6 @@ namespace
   }
 }
 
-// Ensure that the cache is always closed when main() exits.  Without
-// this, there might be dangling flyweights hanging around, and those
-// can trigger aborts when the static flyweight pool is destroyed.
-//
-// TBH, I think it might be worth writing our own flyweight stand-in
-// to avoid this particular bit of stupid.  On the other hand, it
-// might be better to fully shut down the cache all the time, to
-// better detect leaks and so on?  I'm undecided -- and it shouldn't
-// take too long to clear out the cache.
-struct close_cache_on_exit
-{
-  close_cache_on_exit()
-  {
-  }
-
-  ~close_cache_on_exit()
-  {
-    apt_shutdown();
-  }
-};
-
 void do_message_logged(std::ostream &out,
                        const char *sourceFilename,
                        int sourceLineNumber,
@@ -593,7 +569,7 @@ void handle_message_logged(const char *sourceFilename,
     }
 }
 
-int main(int argc, char *argv[])
+int main(int argc, const char *argv[])
 {
   // Block signals that we want to sigwait() on by default and put the
   // signal mask into a known state.  This ensures that unless threads
@@ -635,15 +611,96 @@ int main(int argc, char *argv[])
   const char * const rootdir = getenv("APT_ROOT_DIR");
   apt_preinit(rootdir);
 
-  close_cache_on_exit close_on_exit;
+  // Ensure that the cache is always closed when main() exits.  Without
+  // this, there might be dangling flyweights hanging around, and those
+  // can trigger aborts when the static flyweight pool is destroyed.
+  //
+  // TBH, I think it might be worth writing our own flyweight stand-in
+  // to avoid this particular bit of stupid.  On the other hand, it
+  // might be better to fully shut down the cache all the time, to
+  // better detect leaks and so on?  I'm undecided -- and it shouldn't
+  // take too long to clear out the cache.
+  atexit(&apt_shutdown);
+
+  // NOTE: this can of course be spoofed.  Anyone bothering to is off their
+  //      rocker.
+  argv0=argv[0];
+
+  // Backwards bug-compatibility; old versions used a misleading name
+  // for this option.
+  if(aptcfg->Find(PACKAGE "::Keep-Unused-Pattern", "") == "")
+    {
+      aptcfg->Set(PACKAGE "::Keep-Unused-Pattern",
+		  aptcfg->Find(PACKAGE "::Delete-Unused-Pattern", ""));
+      aptcfg->Set(PACKAGE "::Delete-Unused-Pattern", "");
+    }
+  else
+    aptcfg->Set(PACKAGE "::Delete-Unused-Pattern", "");
+
+  // By default don't log anything below WARN.
+  Logger::getLogger("")->setLevel(WARN_LEVEL);
+
+  // HACK: Support for optional values in CommandLine.
+  for(int i = 1; i != argc; ++i)
+    {
+      if(strcasecmp("--show-summary", argv[i]) == 0)
+        argv[i] = strdup("--show-summary=first-package");
+    }
+
+  // Push existing errors so we can check for only option errors
+  // later.
+  _error->PushToStack();
+
+  // Parse the command line options.
+  CommandLine cmdl(opts, _config);
+  if(cmdl.Parse(argc, argv) == false)
+    {
+      _error->DumpErrors();
+      return 100;
+    }
+
+  if(aptcfg->FindB("help", false) == true)
+    {
+      usage();
+      return 0;
+    }
+
+  if(aptcfg->FindB("version", false) == true)
+    {
+      show_version();
+      return 0;
+    }
+
+  // HACK: Multiplexed arguments not supported by CommandLine.
+  {
+    string display_format = _config->Find(PACKAGE "::%::display-format", "");
+    if(display_format.empty() == false)
+      {
+        _config->Set(PACKAGE "::CmdLine::Package-Display-Format", display_format);
+        _config->Set(PACKAGE "::CmdLine::Version-Display-Format", display_format);
+      }
+
+    if(_config->FindB(PACKAGE "::%::without-recommends", false) == true)
+      {
+        _config->Set("APT::Install-Recommends", false);
+        _config->Set("APT::AutoRemove::Recommends-Important", true);
+      }
+
+    if(_config->FindB(PACKAGE "::%::log-resolver", false) == true)
+      {
+        _config->Set(PACKAGE "::Logging::Levels::", "aptitude.resolver.search:trace");
+        _config->Set(PACKAGE "::Logging::Levels::", "aptitude.resolver.search.costs:info");
+      }
+  }
 
   // The filename to read status information from.
-  char *status_fname=NULL;
+  string status_file = aptcfg->Find(PACKAGE "::%::pkgstates.in", "");
+  char *status_fname = status_file.empty() ? NULL : strdup(status_file.c_str());
   string package_display_format = aptcfg->Find(PACKAGE "::CmdLine::Package-Display-Format", "%c%a%M %p# - %d#");
   string version_display_format = aptcfg->Find(PACKAGE "::CmdLine::Version-Display-Format", "%c%a%M %p# %t %i");
   string group_by_mode_string = aptcfg->Find(PACKAGE "::CmdLine::Versions-Group-By", "auto");
   string show_package_names_mode_string = aptcfg->Find(PACKAGE "::CmdLine::Versions-Show-Package-Names", "auto");
-  string sort_policy="name,version";
+  string sort_policy = aptcfg->Find(PACKAGE "::CmdLine::Sorting", "name,version");
   string width=aptcfg->Find(PACKAGE "::CmdLine::Package-Display-Width", "");
   // Set to a non-empty string to enable logging simplistically; set
   // to "-" to log to stdout.
@@ -653,9 +710,11 @@ int main(int argc, char *argv[])
   bool download_only=aptcfg->FindB(PACKAGE "::CmdLine::Download-Only", false);;
   bool arch_only = aptcfg->FindB("Apt::Get::Arch-Only", false);
 
-  bool update_only=false, install_only=false, queue_only=false;
-  bool autoclean_only = false;
-  bool clean_only = false;
+  bool update_only = aptcfg->FindB(PACKAGE "::UI::Update-On-Startup", false);
+  bool install_only = aptcfg->FindB(PACKAGE "::UI::Install-On-Startup", false);
+  bool queue_only = aptcfg->FindB(PACKAGE "::CmdLine::Schedule-Only", false);
+  bool autoclean_only = aptcfg->FindB(PACKAGE "::UI::Autoclean-On-Startup", false);
+  bool clean_only = aptcfg->FindB(PACKAGE "::UI::Clean-On-Startup", false);
   bool assume_yes=aptcfg->FindB(PACKAGE "::CmdLine::Assume-Yes", false);
   bool fix_broken=aptcfg->FindB(PACKAGE "::CmdLine::Fix-Broken", false);
   bool safe_resolver_no_new_installs = aptcfg->FindB(PACKAGE "::Safe-Resolver::No-New-Installs", false);
@@ -665,6 +724,13 @@ int main(int argc, char *argv[])
   resolver_mode_tp resolver_mode = resolver_mode_default;
   if(aptcfg->FindB(PACKAGE "::Always-Use-Safe-Resolver", false))
     resolver_mode = resolver_mode_safe;
+  if(aptcfg->FindB(PACKAGE "::%::safe-resolver", false) == true
+     && aptcfg->FindB(PACKAGE "::%::full-resolver", false) == true)
+    _error->Error(_("Conflicting command line options --safe-resolver and --full-resolver"));
+  if(aptcfg->FindB(PACKAGE "::%::safe-resolver", false) == true)
+    resolver_mode = resolver_mode_safe;
+  if(aptcfg->FindB(PACKAGE "::%::full-resolver", false) == true)
+    resolver_mode = resolver_mode_full;
 
   bool disable_columns = aptcfg->FindB(PACKAGE "::CmdLine::Disable-Columns", false);
 
@@ -676,323 +742,15 @@ int main(int argc, char *argv[])
   bool visual_preview=aptcfg->FindB(PACKAGE "::CmdLine::Visual-Preview", false);
   bool always_prompt=aptcfg->FindB(PACKAGE "::CmdLine::Always-Prompt", false);
   int verbose=aptcfg->FindI(PACKAGE "::CmdLine::Verbose", 0);
-  bool seen_quiet = false;
-  int quiet = 0;
-  std::vector<aptitude::cmdline::tag_application> user_tags;
 
-#ifdef HAVE_GTK
-  // TODO: this should be a configuration option.
-  bool use_gtk_gui = aptcfg->FindB(PACKAGE "::Start-Gui", true);
-  // Use the in-progress new GUI harness instead of the old code.
-  bool use_new_gtk_gui = false;
-#endif
-
-#ifdef HAVE_QT
-  // Use Qt frontend.
-  bool use_qt_gui = false;
-#endif
-
-  int curopt;
-  // The last option seen
-
-  // NOTE: this can of course be spoofed.  Anyone bothering to is off their
-  //      rocker.
-  argv0=argv[0];
-
-  // Backwards bug-compatibility; old versions used a misleading name
-  // for this option.
-  if(aptcfg->Find(PACKAGE "::Keep-Unused-Pattern", "") == "")
+  std::vector<aptitude::cmdline::tag_application> user_tags;
+  if(read_user_tag_applications(user_tags) == false)
     {
-      aptcfg->Set(PACKAGE "::Keep-Unused-Pattern",
-		  aptcfg->Find(PACKAGE "::Delete-Unused-Pattern", ""));
-      aptcfg->Set(PACKAGE "::Delete-Unused-Pattern", "");
+      _error->DumpErrors();
+      return 100;
     }
-  else
-    aptcfg->Set(PACKAGE "::Delete-Unused-Pattern", "");
-
-  // By default don't log anything below WARN.
-  Logger::getLogger("")->setLevel(WARN_LEVEL);
 
-  // Read the arguments:
-  while((curopt=getopt_long(argc, argv, "DVZWvhS:uiF:w:sO:fdyPt:q::Rro:", opts, NULL))!=-1)
-    {
-      switch(curopt)
-	{
-	case 'S':
-	  status_fname=strdup(optarg);
-	  break;
-	case 'h':
-	  usage();
-	  exit(0);
-	case 'u':
-	  update_only=true;
-	  break;
-	case 'i':
-	  install_only=true;
-	  break;
-	case 'F':
-	  package_display_format=optarg;
-          version_display_format = optarg;
-	  break;
-	case 'w':
-	  width=optarg;
-	  break;
-	case 's':
-	  simulate=true;
-	  break;
-	case 'O':
-	  sort_policy=optarg;
-	  break;
-	case 'f':
-	  fix_broken=true;
-	  break;
-	case 'd':
-	  download_only=true;
-	  break;
-	case 'y':
-	  assume_yes=true;
-	  break;
-	case 'q':
-	  if(optarg == 0)
-	    ++quiet;
-	  else
-	    {
-	      if(*optarg == '=')
-		++optarg;
-
-	      if(*optarg == 0)
-		{
-		  fprintf(stderr, _("Expected a number after -q=\n"));
-		  return -1;
-		}
-
-	      char *tmp;
-	      quiet = strtol(optarg, &tmp, 0);
-
-	      if(*tmp != '\0')
-		{
-		  fprintf(stderr, _("Expected a number after -q=, got %s\n"),
-			  optarg);
-		  return -1;
-		}
-	    }
-	  seen_quiet = true;
-	  break;
-	case 'r':
-	  aptcfg->SetNoUser("Apt::Install-Recommends", "true");
-	  break;
-	case 'R':
-	  aptcfg->SetNoUser("Apt::Install-Recommends", "false");
-	  aptcfg->SetNoUser("Apt::AutoRemove::RecommendsImportant", "true");
-	  break;
-	case 't':
-	  aptcfg->SetNoUser("APT::Default-Release", optarg);
-	  break;
-	case 'o':
-	  {
-	    string s=optarg;
-	    string::size_type eqloc=s.find('=');
-
-	    // note that if eqloc!=s.npos, s.size()>0
-	    if(eqloc==s.npos || eqloc==s.size()-1)
-	      fprintf(stderr, _("-o requires an argument of the form key=value, got %s\n"), optarg);
-	    else
-	      {
-		string key(s, 0, eqloc), value(s, eqloc+1);
-
-		aptcfg->SetNoUser(key, value);
-	      }
-	  }
-	  break;
-	case 'v':
-	  ++verbose;
-	  break;
-	case 'V':
-	  showvers=true;
-	  break;
-	case 'D':
-	  showdeps=true;
-	  break;
-	case 'Z': // ew
-	  showsize=true;
-	  break;
-	case 'W':
-	  showwhy = true;
-	  break;
-	case 'P':
-	  always_prompt=true;
-	  break;
-	case ':':
-	case '?':
-	  usage();
-	  exit(1);
-	case 0:
-	  switch(getopt_result)
-	    {
-	    case OPTION_VERSION:
-	      show_version();
-	      exit(0);
-	    case OPTION_ALLOW_UNTRUSTED:
-	      aptcfg->Set(PACKAGE "::CmdLine::Ignore-Trust-Violations", true);
-	      break;
-	    case OPTION_SHOW_RESOLVER_ACTIONS:
-	      safe_resolver_show_resolver_actions = true;
-	      break;
-	    case OPTION_NO_SHOW_RESOLVER_ACTIONS:
-	      safe_resolver_show_resolver_actions = false;
-	      break;
-	    case OPTION_NO_NEW_INSTALLS:
-	      safe_resolver_no_new_installs = true;
-	      break;
-	    case OPTION_ALLOW_NEW_INSTALLS:
-	      safe_resolver_no_new_installs = false;
-	      break;
-	    case OPTION_NO_NEW_UPGRADES:
-	      safe_resolver_no_new_upgrades = true;
-	      break;
-	    case OPTION_ALLOW_NEW_UPGRADES:
-	      safe_resolver_no_new_upgrades = false;
-	      break;
-	    case OPTION_SAFE_RESOLVER:
-	      resolver_mode = resolver_mode_safe;
-	      break;
-	    case OPTION_FULL_RESOLVER:
-	      resolver_mode = resolver_mode_full;
-	      break;
-	    case OPTION_VISUAL_PREVIEW:
-	      visual_preview=true;
-	      break;
-	    case OPTION_QUEUE_ONLY:
-	      queue_only=true;
-	      break;
-	    case OPTION_PURGE_UNUSED:
-	      aptcfg->Set(PACKAGE "::Purge-Unused", "true");
-	      break;
-	    case OPTION_ADD_USER_TAG:
-	    case OPTION_REMOVE_USER_TAG:
-	      {
-		using aptitude::cmdline::tag_application;
-		const bool is_add = (getopt_result == OPTION_ADD_USER_TAG);
-		user_tags.push_back(tag_application(is_add, optarg, NULL));
-		break;
-	      }
-	    case OPTION_ADD_USER_TAG_TO:
-	    case OPTION_REMOVE_USER_TAG_FROM:
-	      {
-		using aptitude::cmdline::tag_application;
-		const bool is_add = (getopt_result == OPTION_ADD_USER_TAG);
-		const std::string arg = optarg;
-		const std::string::size_type splitloc = arg.find(',');
-		if(splitloc == arg.npos)
-		  {
-		    fprintf(stderr, _("No comma following tag name \"%s\".\n"), arg.c_str());
-		    return -1;
-		  }
-		else
-		  {
-		    const std::string patternstr(arg, splitloc + 1);
-		    const std::vector<const char *> terminators;
-		    cwidget::util::ref_ptr<aptitude::matching::pattern> p =
-		      aptitude::matching::parse(patternstr,
-						terminators,
-						true,
-						false);
-
-		    if(!p.valid())
-		      {
-			_error->DumpErrors();
-			return -1;
-		      }
-
-		    user_tags.push_back(tag_application(is_add, optarg, p));
-		  }
-	      }
-	    case OPTION_NOT_ARCH_ONLY:
-	      arch_only = false;
-	      break;
-	    case OPTION_ARCH_ONLY:
-	      arch_only = true;
-	      break;
-	    case OPTION_DISABLE_COLUMNS:
-	      disable_columns = true;
-	      break;
-#ifdef HAVE_GTK
-	    case OPTION_GUI:
-	      use_gtk_gui = true;
-	      break;
-	    case OPTION_NO_GUI:
-	      use_gtk_gui = false;
-	      break;
-#else
-	    case OPTION_NO_GUI:
-	      // Recognize it as a NOP.
-	      break;
-#endif
-	    case OPTION_LOG_LEVEL:
-	      apply_logging_level(optarg);
-	      break;
-	    case OPTION_LOG_FILE:
-	      log_file = optarg;
-	      break;
-	    case OPTION_LOG_RESOLVER:
-	      enable_resolver_log();
-	      break;
-
-	    case OPTION_SHOW_SUMMARY:
-	      if(optarg == NULL)
-		show_why_summary_mode = "first-package";
-	      else
-		show_why_summary_mode = optarg;
-	      break;
-
-	    case OPTION_AUTOCLEAN_ON_STARTUP:
-	      autoclean_only = true;
-	      break;
-
-	    case OPTION_CLEAN_ON_STARTUP:
-	      clean_only = true;
-	      break;
-
-            case OPTION_GROUP_BY:
-              group_by_mode_string = optarg;
-              break;
-
-            case OPTION_SHOW_PACKAGE_NAMES:
-              show_package_names_mode_string = optarg;
-              break;
-
-            case OPTION_NEW_GUI:
-#ifdef HAVE_GTK
-              use_new_gtk_gui = true;
-#endif
-              break;
-#ifdef HAVE_QT
-	    case OPTION_QT_GUI:
-	      use_qt_gui = true;
-	      break;
-
-	    case OPTION_NO_QT_GUI:
-	      use_qt_gui = false;
-	      break;
-#endif
-	    default:
-	      fprintf(stderr, "%s",
-		      _("WEIRDNESS: unknown option code received\n"));
-	      break;
-	    }
-
-	  getopt_result=0;
-
-	  break;
-
-	default:
-	  fprintf(stderr, "%s",
-		  _("WEIRDNESS: unknown option code received\n"));
-	  break;
-	}
-    }
-
-  group_by_option group_by_mode;
+  group_by_option group_by_mode = group_by_auto;
   try
     {
       group_by_mode = parse_group_by_option(group_by_mode_string);
@@ -1000,10 +758,9 @@ int main(int argc, char *argv[])
   catch(std::exception &ex)
     {
       _error->Error("%s", ex.what());
-      group_by_mode = group_by_auto;
     }
 
-  show_package_names_option show_package_names_mode;
+  show_package_names_option show_package_names_mode = show_package_names_auto;
   if(show_package_names_mode_string == "never" ||
      show_package_names_mode_string == P_("--show-package-names|never"))
     show_package_names_mode = show_package_names_never;
@@ -1014,14 +771,11 @@ int main(int argc, char *argv[])
           show_package_names_mode_string == P_("--show-package-names|always"))
     show_package_names_mode = show_package_names_always;
   else
-    {
-      _error->Error("%s",
-                    (boost::format(_("Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or \"always\")."))
-                     % show_package_names_mode_string).str().c_str());
-      show_package_names_mode = show_package_names_auto;
-    }
+    _error->Error(_("Invalid package names display mode \"%s\" (should be"
+                    " \"never\", \"auto\", or \"always\")."),
+                  show_package_names_mode_string.c_str());
 
-  aptitude::why::roots_string_mode why_display_mode;
+  aptitude::why::roots_string_mode why_display_mode = aptitude::why::no_summary;
   if(show_why_summary_mode == "no-summary" || show_why_summary_mode == _("no-summary"))
     why_display_mode = aptitude::why::no_summary;
   else if(show_why_summary_mode == "first-package" || show_why_summary_mode == _("first-package"))
@@ -1033,13 +787,13 @@ int main(int argc, char *argv[])
   else if(show_why_summary_mode == "all-packages-with-dep-versions" || show_why_summary_mode == _("all-packages-with-dep-versions"))
     why_display_mode = aptitude::why::show_chain_with_versions;
   else
-    {
-      // ForTranslators: "why" here is the aptitude command name and
-      // should not be translated.
-      _error->Error(_("Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package\", \"first-package-and-type\", \"all-packages\", or \"all-packages-with-dep-versions\"."),
-		    show_why_summary_mode.c_str());
-      why_display_mode = aptitude::why::no_summary;
-    }
+    // ForTranslators: "why" here is the aptitude command name and
+    // should not be translated.
+    _error->Error(_("Invalid \"why\" summary mode \"%s\": expected"
+                    " \"no-summary\", \"first-package\","
+                    " \"first-package-and-type\", \"all-packages\","
+                    " or \"all-packages-with-dep-versions\"."),
+                  show_why_summary_mode.c_str());
 
   apply_config_file_logging_levels(aptcfg);
 
@@ -1052,15 +806,15 @@ int main(int argc, char *argv[])
 
   const bool debug_search = aptcfg->FindB(PACKAGE "::CmdLine::Debug-Search", false);
 
-  int curr_quiet = aptcfg->FindI("quiet", 0);
-  if(seen_quiet)
-    aptcfg->SetNoUser("quiet", quiet);
-  if(quiet == 0 && !isatty(1))
-    aptcfg->SetNoUser("quiet", std::max(curr_quiet, 1));
+  if(!isatty(STDOUT_FILENO) && aptcfg->FindI("quiet", -1) == -1)
+    aptcfg->SetNoUser("quiet", 1);
+  int quiet = aptcfg->FindI("quiet");
 
   if(simulate)
     aptcfg->SetNoUser(PACKAGE "::Simulate", true);
 
+  const bool cmdline_mode = cmdl.FileSize() > 0;
+
   // Sanity-check
   {
     int num_startup_actions = 0;
@@ -1074,60 +828,63 @@ int main(int argc, char *argv[])
       ++num_startup_actions;
 
     if(num_startup_actions > 1)
-      {
-	fprintf(stderr, "%s",
-		_("Only one of --auto-clean-on-startup, --clean-on-startup, -i, and -u may be specified\n"));
-	usage();
-	exit(1);
-      }
+      _error->Error(_("Only one of --auto-clean-on-startup,"
+                      " --clean-on-startup, -i, and -u may be specified"));
   }
 
-  if((update_only || install_only || autoclean_only || clean_only) && optind != argc)
+  if((update_only || install_only || autoclean_only || clean_only)
+     && cmdline_mode == true)
+    _error->Error(_("-u, -i, --clean-on-startup, and --autoclean-on-startup"
+                    " may not be specified in command-line mode (eg, with"
+                    " 'install')"));
+
+  // Abort now if there were any errors.
+  if(_error->PendingError() == true)
     {
-      fprintf(stderr, "%s\n",
-	      _("-u, -i, and --clean-on-startup may not be specified in command-line mode (eg, with 'install')"));
-      usage();
-      exit(1);
+      _error->DumpErrors();
+      return 100;
     }
 
+  _error->MergeWithStack();
+
   // Possibly run off and do other commands.
-  if(optind!=argc)
+  if(cmdline_mode == true)
     {
+      using namespace aptitude::cmdline;
+
       try
 	{
 	  // Connect up the "please consume errors" routine for the
 	  // command-line.
-	  consume_errors.connect(sigc::mem_fun(_error, (void (GlobalError::*)()) &GlobalError::DumpErrors));
+	  consume_errors.connect(
+            sigc::mem_fun(_error,
+                          (void (GlobalError::*)()) &GlobalError::PushToStack));
 
-	  if(update_only || install_only || autoclean_only || clean_only)
-	    {
-	      fprintf(stderr, "%s\n",
-		      _("-u, -i, and --clean-on-startup may not be specified with a command"));
-	      usage();
-	      exit(1);
-	    }
+          int filec = cmdl.FileSize();
+          char **filev = const_cast<char **>(cmdl.FileList);
+          int rval = 0;
 
 	  // TODO: warn the user if they passed --full-resolver to
 	  // something other than "upgrade" or do_action.
 
-	  if(!strcasecmp(argv[optind], "update"))
-	    return cmdline_update(argc-optind, argv+optind, verbose);
-	  else if(!strcasecmp(argv[optind], "clean"))
-	    return cmdline_clean(argc-optind, argv+optind, simulate);
-	  else if(!strcasecmp(argv[optind], "autoclean"))
-	    return cmdline_autoclean(argc-optind, argv+optind, simulate);
-	  else if(!strcasecmp(argv[optind], "forget-new"))
-	    return cmdline_forget_new(argc-optind, argv+optind,
+	  if(!strcasecmp(filev[0], "update"))
+	    rval = cmdline_update(filec, filev, verbose);
+	  else if(!strcasecmp(filev[0], "clean"))
+	    rval = cmdline_clean(filec, filev, simulate);
+	  else if(!strcasecmp(filev[0], "autoclean"))
+	    rval = cmdline_autoclean(filec, filev, simulate);
+	  else if(!strcasecmp(filev[0], "forget-new"))
+	    rval = cmdline_forget_new(filec, filev,
 				      status_fname, simulate);
-	  else if(!strcasecmp(argv[optind], "search"))
-	    return cmdline_search(argc-optind, argv+optind,
+	  else if(!strcasecmp(filev[0], "search"))
+	    rval = cmdline_search(filec, filev,
 				  status_fname,
 				  package_display_format, width,
 				  sort_policy,
 				  disable_columns,
 				  debug_search);
-          else if(!strcasecmp(argv[optind], "versions"))
-            return cmdline_versions(argc - optind, argv + optind,
+          else if(!strcasecmp(filev[0], "versions"))
+            rval = cmdline_versions(filec, filev,
                                     status_fname,
                                     version_display_format, width,
                                     sort_policy,
@@ -1135,88 +892,100 @@ int main(int argc, char *argv[])
                                     debug_search,
                                     group_by_mode,
                                     show_package_names_mode);
-	  else if(!strcasecmp(argv[optind], "why"))
-	    return cmdline_why(argc - optind, argv + optind,
+	  else if(!strcasecmp(filev[0], "why"))
+	    rval = cmdline_why(filec, filev,
 			       status_fname, verbose,
 			       why_display_mode, false);
-	  else if(!strcasecmp(argv[optind], "why-not"))
-	    return cmdline_why(argc - optind, argv + optind,
+	  else if(!strcasecmp(filev[0], "why-not"))
+	    rval = cmdline_why(filec, filev,
 			       status_fname, verbose,
 			       why_display_mode, true);
-	  else if( (!strcasecmp(argv[optind], "install")) ||
-		   (!strcasecmp(argv[optind], "reinstall")) ||
-		   (!strcasecmp(argv[optind], "dist-upgrade")) ||
-		   (!strcasecmp(argv[optind], "full-upgrade")) ||
-		   (!strcasecmp(argv[optind], "safe-upgrade")) ||
-		   (!strcasecmp(argv[optind], "upgrade")) ||
-		   (!strcasecmp(argv[optind], "remove")) ||
-		   (!strcasecmp(argv[optind], "purge")) ||
-		   (!strcasecmp(argv[optind], "hold")) ||
-		   (!strcasecmp(argv[optind], "unhold")) ||
-		   (!strcasecmp(argv[optind], "markauto")) ||
-		   (!strcasecmp(argv[optind], "unmarkauto")) ||
-		   (!strcasecmp(argv[optind], "forbid-version")) ||
-		   (!strcasecmp(argv[optind], "keep")) ||
-		   (!strcasecmp(argv[optind], "keep-all")) ||
-		   (!strcasecmp(argv[optind], "build-dep")) ||
-		   (!strcasecmp(argv[optind], "build-depends")))
-	    {
-	      return cmdline_do_action(argc-optind, argv+optind,
-				       status_fname,
-				       simulate, assume_yes, download_only,
-				       fix_broken, showvers, showdeps,
-				       showsize, showwhy,
-				       visual_preview, always_prompt,
-				       resolver_mode, safe_resolver_show_resolver_actions,
-				       safe_resolver_no_new_installs, safe_resolver_no_new_upgrades,
-				       user_tags,
-				       arch_only, queue_only, verbose);
-	    }
-	  else if(!strcasecmp(argv[optind], "add-user-tag") ||
-		  !strcasecmp(argv[optind], "remove-user-tag"))
-	    return aptitude::cmdline::cmdline_user_tag(argc - optind, argv + optind,
-						       quiet, verbose);
-	  else if(!strcasecmp(argv[optind], "extract-cache-subset"))
-	    return aptitude::cmdline::extract_cache_subset(argc - optind,
-							   argv + optind);
-	  else if(!strcasecmp(argv[optind], "download"))
-	    return cmdline_download(argc-optind, argv+optind);
-	  else if(!strcasecmp(argv[optind], "changelog"))
-	    return cmdline_changelog(argc-optind, argv+optind);
-	  else if(!strcasecmp(argv[optind], "moo"))
-	    return cmdline_moo(argc-optind, argv+optind, verbose);
-	  else if(!strcasecmp(argv[optind], "show"))
-	    return cmdline_show(argc-optind, argv+optind, verbose);
-	  else if(!strcasecmp(argv[optind], "dump-resolver"))
-	    return cmdline_dump_resolver(argc-optind, argv+optind, status_fname);
-	  else if(!strcasecmp(argv[optind], "check-resolver"))
-	    return cmdline_check_resolver(argc-optind, argv+optind, status_fname);
-	  else if(!strcasecmp(argv[optind], "help"))
-	    {
-	      usage();
-	      exit(0);
-	    }
+	  else if( (!strcasecmp(filev[0], "install")) ||
+		   (!strcasecmp(filev[0], "reinstall")) ||
+		   (!strcasecmp(filev[0], "dist-upgrade")) ||
+		   (!strcasecmp(filev[0], "full-upgrade")) ||
+		   (!strcasecmp(filev[0], "safe-upgrade")) ||
+		   (!strcasecmp(filev[0], "upgrade")) ||
+		   (!strcasecmp(filev[0], "remove")) ||
+		   (!strcasecmp(filev[0], "purge")) ||
+		   (!strcasecmp(filev[0], "hold")) ||
+		   (!strcasecmp(filev[0], "unhold")) ||
+		   (!strcasecmp(filev[0], "markauto")) ||
+		   (!strcasecmp(filev[0], "unmarkauto")) ||
+		   (!strcasecmp(filev[0], "forbid-version")) ||
+		   (!strcasecmp(filev[0], "keep")) ||
+		   (!strcasecmp(filev[0], "keep-all")) ||
+		   (!strcasecmp(filev[0], "build-dep")) ||
+		   (!strcasecmp(filev[0], "build-depends")))
+            rval = cmdline_do_action(filec, filev,
+                                     status_fname,
+                                     simulate, assume_yes, download_only,
+                                     fix_broken, showvers, showdeps,
+                                     showsize, showwhy,
+                                     visual_preview, always_prompt,
+                                     resolver_mode, safe_resolver_show_resolver_actions,
+                                     safe_resolver_no_new_installs, safe_resolver_no_new_upgrades,
+                                     user_tags,
+                                     arch_only, queue_only, verbose);
+	  else if(!strcasecmp(filev[0], "add-user-tag") ||
+		  !strcasecmp(filev[0], "remove-user-tag"))
+	    rval = cmdline_user_tag(filec, filev,
+                                    quiet, verbose);
+	  else if(!strcasecmp(filev[0], "extract-cache-subset"))
+	    rval = extract_cache_subset(filec, filev);
+	  else if(!strcasecmp(filev[0], "download"))
+	    rval = cmdline_download(filec, filev);
+	  else if(!strcasecmp(filev[0], "changelog"))
+	    rval = cmdline_changelog(filec, filev);
+	  else if(!strcasecmp(filev[0], "moo"))
+	    rval = cmdline_moo(filec, filev, verbose);
+	  else if(!strcasecmp(filev[0], "show"))
+	    rval = cmdline_show(filec, filev, verbose);
+	  else if(!strcasecmp(filev[0], "dump-resolver"))
+	    rval = cmdline_dump_resolver(filec, filev, status_fname);
+	  else if(!strcasecmp(filev[0], "check-resolver"))
+	    rval = cmdline_check_resolver(filec, filev, status_fname);
+	  else if(!strcasecmp(filev[0], "help"))
+            usage();
 	  // Debugging/profiling commands:
-	  else if(!strcasecmp(argv[optind], "nop"))
+	  else if(!strcasecmp(filev[0], "nop"))
 	    {
 	      OpTextProgress p(aptcfg->FindI("Quiet", 0));
-	      _error->DumpErrors();
 	      apt_init(&p, true);
-	      exit(0);
 	    }
-	  else if(!strcasecmp(argv[optind], "nop-noselections"))
+	  else if(!strcasecmp(filev[0], "nop-noselections"))
 	    {
 	      OpTextProgress p(aptcfg->FindI("Quiet", 0));
-	      _error->DumpErrors();
 	      apt_init(&p, false);
-	      exit(0);
 	    }
+          else if(!strcasecmp(filev[0], "dump-config"))
+            {
+              OpTextProgress p(aptcfg->FindI("Quiet", 0));
+              apt_init(&p, false);
+              _config->Dump(std::cout);
+            }
 	  else
 	    {
-	      fprintf(stderr, _("Unknown command \"%s\"\n"), argv[optind]);
-	      usage();
-	      exit(1);
+              _error->Error(_("Unknown command \"%s\""), filev[0]);
+              rval = 100;
 	    }
+
+          while(_error->StackCount() > 0)
+            _error->MergeWithStack();
+
+          if(_error->PendingError() == true && rval == 0)
+            rval = 100;
+
+          // Do not dump errors if user aborted.
+          if(rval == 1)
+            return rval;
+
+          if(aptcfg->FindI("quiet", 0) > 0)
+            _error->DumpErrors();
+          else
+            _error->DumpErrors(GlobalError::DEBUG);
+
+          return rval;
 	}
       catch(StdinEOFException)
 	{
@@ -1230,12 +999,12 @@ int main(int argc, char *argv[])
 	  std::string backtrace = e.get_backtrace();
 	  if(!backtrace.empty())
 	    fprintf(stderr, _("Backtrace:\n%s\n"), backtrace.c_str());
-	  return -1;
+	  return 100;
 	}
     }
 
 #ifdef HAVE_QT
-  if(use_qt_gui)
+  if(aptcfg->FindB(PACKAGE "::%::qt-gui", false) == true)
     {
       if(aptitude::gui::qt::main(argc, argv))
         return 0;
@@ -1247,9 +1016,9 @@ int main(int argc, char *argv[])
 #endif
 
 #ifdef HAVE_GTK
-  if(use_gtk_gui)
+  if(aptcfg->FindB(PACKAGE "::%::start-gui", false) == true)
     {
-      if(use_new_gtk_gui)
+      if(aptcfg->FindB(PACKAGE "::%::new-gui", false) == true)
         {
           if(gui::init(argc, argv))
             return 0;
@@ -1316,11 +1085,11 @@ int main(int argc, char *argv[])
           if(!backtrace.empty())
             fprintf(stderr, _("Backtrace:\n%s\n"), backtrace.c_str());
 
-          return -1;
+	  return 100;
         }
 
-      // The cache is closed when the close_on_exit object declared
-      // above is destroyed.
+      // The cache is closed by apt_shutdown, which was registered
+      // earlier with atexit(3).
 
       return 0;
     }
diff --git a/src/mine/Makefile.in b/src/mine/Makefile.in
index 03a283ef..0a736639 100644
--- a/src/mine/Makefile.in
+++ b/src/mine/Makefile.in
@@ -222,6 +222,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/pkg_grouppolicy.cc b/src/pkg_grouppolicy.cc
index 97875c08..1844c6a0 100644
--- a/src/pkg_grouppolicy.cc
+++ b/src/pkg_grouppolicy.cc
@@ -259,12 +259,7 @@ void pkg_grouppolicy_section::add_package(const pkgCache::PkgIterator &pkg,
   bool may_passthrough = false;
 
   string section;
-  if(!strncmp(pkg.Name(), "task-", 5))
-    {
-      section=_("Tasks");
-      may_passthrough = true;
-    }
-  else if(pkg.VersionList().end())
+  if(pkg.VersionList().end())
     {
       section=_("virtual");
       may_passthrough = true;
@@ -275,6 +270,11 @@ void pkg_grouppolicy_section::add_package(const pkgCache::PkgIterator &pkg,
       section=_("Unknown");
       may_passthrough = true;
     }
+  else if(strcmp(pkg.VersionList().Section(), "tasks") == 0)
+    {
+      section=_("Tasks");
+      may_passthrough = true;
+    }
   else
     {
       section=pkg.VersionList().Section();
@@ -1399,29 +1399,21 @@ public:
   virtual void add_package(const pkgCache::PkgIterator &pkg,
 			   pkg_subtree *root)
   {
-#ifdef HAVE_EPT
     using aptitude::apt::get_facet_name;
     using aptitude::apt::get_tag_long_description;
     using aptitude::apt::get_tag_name;
     using aptitude::apt::get_tag_short_description;
     using aptitude::apt::get_tags;
     using aptitude::apt::tag;
-#endif
 
-#ifdef HAVE_EPT
-    const set<tag> realTags(get_tags(pkg));
-    const set<tag> * const tags(&realTags);
-#else
-    const set<tag> * const tags(get_tags(pkg));
-#endif
+    const set<tag> tags(get_tags(pkg));
 
-    if(tags != NULL)
+    if(tags.empty() == true)
       return;
 
-    for(set<tag>::const_iterator ti = tags->begin();
-	ti != tags->end(); ++ti)
+    for(set<tag>::const_iterator ti = tags.begin();
+	ti != tags.end(); ++ti)
       {
-#ifdef HAVE_EPT
         const std::string thisfacet = get_facet_name(*ti);
 
 	// Don't create items for tags that aren't in our facet.
@@ -1432,23 +1424,6 @@ public:
 	// call it?
 	std::string tagname = get_tag_name(*ti);
 
-#else // HAVE_EPT
-	tag::const_iterator j = ti->begin();
-	if(j == ti->end())
-	  continue;
-
-	string thisfacet = *j;
-
-	if(thisfacet != match_facet)
-	  continue;
-
-	++j;
-	if(j == ti->end())
-	  continue;
-
-	string tagname = *j;
-#endif // HAVE_EPT
-
 	childmap::const_iterator found =
 	  children.find(tagname);
 
@@ -1457,13 +1432,8 @@ public:
 
 	if(found == children.end())
 	  {
-#ifdef HAVE_EPT
 	    const std::string desc = get_tag_long_description(*ti);
 	    const std::string shortdesc = get_tag_short_description(*ti);
-#else // HAVE_EPT
-	    string desc = tag_description(ti->str());
-	    string shortdesc(desc, 0, desc.find('\n'));
-#endif
 
 	    subtree = new pkg_subtree(swsprintf(L"%s - %s",
 						tagname.c_str(),
@@ -1538,20 +1508,13 @@ public:
   virtual void add_package(const pkgCache::PkgIterator &pkg,
 			   pkg_subtree *root)
   {
-#ifdef HAVE_EPT
     using aptitude::apt::get_tags;
     using aptitude::apt::tag;
-#endif
 
-#ifdef HAVE_EPT
-    const set<tag> realTags(get_tags(pkg));
-    const set<tag> * const tags(&realTags);
-#else
-    const set<tag> * const tags(get_tags(pkg));
-#endif
+    const set<tag> tags(get_tags(pkg));
 
     // Put all untagged, non-virtual packages into a separate list.
-    if((tags == NULL || tags->empty()) && !pkg.VersionList().end())
+    if(tags.empty() == true && !pkg.VersionList().end())
       {
 	if(untagged_tree == NULL)
 	  {
@@ -1569,13 +1532,12 @@ public:
 	untagged_policy->add_package(pkg, untagged_tree);
       }
 
-    if(tags == NULL)
+    if(tags.empty() == true)
       return;
 
-    for(set<tag>::const_iterator ti = tags->begin();
-	ti != tags->end(); ++ti)
+    for(set<tag>::const_iterator ti = tags.begin();
+	ti != tags.end(); ++ti)
       {
-#ifdef HAVE_EPT
         using aptitude::apt::get_facet_long_description;
         using aptitude::apt::get_facet_name;
         using aptitude::apt::get_facet_short_description;
@@ -1585,23 +1547,6 @@ public:
 
 	std::string thisfacet(get_facet_name(*ti));
 	std::string thistag(get_tag_name(*ti));
-#else // HAVE_EPT
-	tag::const_iterator j = ti->begin();
-
-	eassert(j != ti->end());
-
-	string thisfacet = *j;
-
-	if(j != ti->end())
-	  ++j;
-
-	string thistag;
-
-	if(j == ti->end())
-	  thistag = _("MISSING TAG");
-	else
-	  thistag = *j;
-#endif
 
 	facetmap::const_iterator facetfound =
 	  children.find(thisfacet);
@@ -1611,13 +1556,8 @@ public:
 
 	if(facetfound == children.end())
 	  {
-#ifdef HAVE_EPT
 	    string desc(get_facet_long_description(*ti));
 	    string shortdesc(get_facet_short_description(*ti));
-#else // HAVE_EPT
-	    string desc = get_facet_description(*ti);
-	    string shortdesc(desc, 0, desc.find('\n'));
-#endif
 
 	    if(!shortdesc.empty())
 	      tagtree = new pkg_subtree(swsprintf(L"%s - %s",
@@ -1649,13 +1589,8 @@ public:
 
 	if(tagfound == tagchildren->end())
 	  {
-#ifdef HAVE_EPT
 	    string desc(get_tag_long_description(*ti));
 	    string shortdesc(get_tag_short_description(*ti));
-#else // HAVE_EPT
-	    string desc = tag_description(ti->str());
-	    string shortdesc(desc, 0, desc.find('\n'));
-#endif
 
 	    if(!shortdesc.empty())
 	      subtree = new pkg_subtree(swsprintf(L"%s - %s",
diff --git a/src/pkg_sortpolicy.cc b/src/pkg_sortpolicy.cc
index bb0578ae..62081f6e 100644
--- a/src/pkg_sortpolicy.cc
+++ b/src/pkg_sortpolicy.cc
@@ -161,6 +161,21 @@ PKG_SORTPOLICY_SUBCLASS(pkg_sortpolicy_priority,
 			else // if(pri1>pri2)
 			  return 1;);
 
+// debsize-sorting, treats virtual packages as 0-size
+PKG_SORTPOLICY_SUBCLASS(pkg_sortpolicy_debsize,
+			if(ver1.end() && ver2.end())
+			  return 0;
+			else if(ver1.end())
+			  return 1;
+			else if(ver2.end())
+			  return -1;
+			else if(ver1->Size<ver2->Size)
+			  return -1;
+			else if(ver1->Size>ver2->Size)
+			  return 1;
+			else
+			  return 0;);
+
 // Sort by version number
 PKG_SORTPOLICY_SUBCLASS(pkg_sortpolicy_ver,
 			if(ver1.end())
diff --git a/src/pkg_sortpolicy.h b/src/pkg_sortpolicy.h
index 40866be3..3685ab1c 100644
--- a/src/pkg_sortpolicy.h
+++ b/src/pkg_sortpolicy.h
@@ -63,6 +63,7 @@ public:
 pkg_sortpolicy *pkg_sortpolicy_name(pkg_sortpolicy *chain, bool reversed);
 pkg_sortpolicy *pkg_sortpolicy_ver(pkg_sortpolicy *chain, bool reversed);
 pkg_sortpolicy *pkg_sortpolicy_installed_size(pkg_sortpolicy *chain, bool reversed);
+pkg_sortpolicy *pkg_sortpolicy_debsize(pkg_sortpolicy *chain, bool reversed);
 pkg_sortpolicy *pkg_sortpolicy_priority(pkg_sortpolicy *chain, bool reversed);
 
 // ewwwwwwww.
diff --git a/src/qt/Makefile.in b/src/qt/Makefile.in
index bc3af644..502ce92c 100644
--- a/src/qt/Makefile.in
+++ b/src/qt/Makefile.in
@@ -198,6 +198,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/src/ui.cc b/src/ui.cc
index f14ef27f..1f8bfe31 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -1257,7 +1257,9 @@ namespace
 void install_or_remove_packages()
 {
   boost::shared_ptr<download_install_manager> m =
-    boost::make_shared<download_install_manager>(false, sigc::ptr_fun(&run_dpkg_with_cwidget_suspended));
+    boost::make_shared<download_install_manager>(false,
+                                                 true,
+                                                 sigc::ptr_fun(&run_dpkg_with_cwidget_suspended));
 
   m->post_forget_new_hook.connect(package_states_changed.make_slot());
 
diff --git a/src/view_changelog.cc b/src/view_changelog.cc
index ae7ed465..0a3d7498 100644
--- a/src/view_changelog.cc
+++ b/src/view_changelog.cc
@@ -385,8 +385,6 @@ public:
 
 void view_changelog(pkgCache::VerIterator ver)
 {
-  bool in_debian=false;
-
   string pkgname = ver.ParentPkg().Name();
 
 
@@ -404,18 +402,6 @@ void view_changelog(pkgCache::VerIterator ver)
     }
 
   // TODO: add a configurable association between origins and changelog URLs.
-  for(pkgCache::VerFileIterator vf=ver.FileList();
-      !vf.end() && !in_debian; ++vf)
-    if(!vf.File().end() && vf.File().Origin()!=NULL &&
-       strcmp(vf.File().Origin(), "Debian")==0)
-      in_debian=true;
-
-  if(!in_debian)
-    {
-      show_message(_("You can only view changelogs of official Debian packages."),
-		   NULL, cw::get_style("Error"));
-      return;
-    }
 
   boost::shared_ptr<changelog_callbacks> callbacks =
     boost::make_shared<changelog_callbacks>(ver.ParentPkg().Name(),
diff --git a/tests/Makefile.in b/tests/Makefile.in
index aa83e241..c59b3888 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -290,6 +290,7 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 VTE_CFLAGS = @VTE_CFLAGS@
 VTE_LIBS = @VTE_LIBS@
+XAPIAN_CONFIG = @XAPIAN_CONFIG@
 XGETTEXT = @XGETTEXT@
 XSLTPROC = @XSLTPROC@
 abs_builddir = @abs_builddir@
diff --git a/tests/test_tags.cc b/tests/test_tags.cc
index f80c1b84..09ccde6e 100644
--- a/tests/test_tags.cc
+++ b/tests/test_tags.cc
@@ -22,7 +22,9 @@
 #endif
 
 
-#ifndef HAVE_EPT
+// TODO: These tests need updating for recent (2012-06-30) changes
+// to out interface to debtags.
+#if 0
 
 #include <cppunit/extensions/HelperMacros.h>