Run "make update-po".

1 files changed, 616 insertions, 474 deletions

diff --git a/po/bs.po b/po/bs.po
index 370ebadc..56a8acd2 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: 2008-02-26 22:27-0800\n"
+"POT-Creation-Date: 2008-03-15 12:39-0700\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"
@@ -422,16 +422,45 @@ msgid ""
 "as unused packages."
 msgstr ""
 
-#: src/apt_options.cc:495
+#: src/apt_options.cc:383
+msgid "Allow dependency resolutions that break holds or forbids"
+msgstr ""
+
+#: src/apt_options.cc:384
+msgid ""
+"If this option is enabled, then whenever aptitude solves a dependency "
+"problem, it will consider modifying held packages, or installing forbidden "
+"package versions.  With this option disabled, these solutions will be "
+"rejected by default.\n"
+"NOTE: At present, this restriction only applies to situations in which "
+"aptitude's dependency resolver (the red bar at the bottom of the screen) is "
+"activated.  aptitude will still break holds when automatically installing "
+"the dependencies of a package that has just been selected for installation "
+"or upgrade, due to apt bug #470035."
+msgstr ""
+
+#: src/apt_options.cc:398
+msgid "Don't warn about the obsolete \"Recommends-Important\" option."
+msgstr ""
+
+#: src/apt_options.cc:399
+msgid ""
+"If the configuration option %BRecommends-Important%b is set in the system "
+"configuration file, aptitude will warn you about it on start-up.  Enable "
+"this option to skip this warning (for instance, if your apt configuration is "
+"shared with a system that has an older version of aptitude installed)."
+msgstr ""
+
+#: src/apt_options.cc:518
 #, fuzzy
 msgid "UI options"
 msgstr "Opcije"
 
-#: src/apt_options.cc:497
+#: src/apt_options.cc:520
 msgid "Dependency handling"
 msgstr ""
 
-#: src/apt_options.cc:499 src/pkg_grouppolicy.cc:995
+#: src/apt_options.cc:522 src/pkg_grouppolicy.cc:995
 msgid "Miscellaneous"
 msgstr ""
 
@@ -473,7 +502,7 @@ msgid "[%d(%d)/...] Resolving dependencies"
 msgstr ""
 
 #: src/broken_indicator.cc:311 src/solution_dialog.cc:140
-#: src/solution_screen.cc:537
+#: src/solution_screen.cc:542
 msgid "Internal error: unexpected null solution."
 msgstr ""
 
@@ -525,134 +554,144 @@ msgstr[1] ""
 msgid "Suggest %F"
 msgstr "Predlaže"
 
-#: src/cmdline/cmdline_action.cc:40
+#: src/cmdline/cmdline_action.cc:47
+#, c-format
+msgid "Unable to find the source package for \"%s\".\n"
+msgstr ""
+
+#: src/cmdline/cmdline_action.cc:200
+#, c-format
+msgid "Unable to satisfy the build-depends %s: ."
+msgstr ""
+
+#: src/cmdline/cmdline_action.cc:230
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already installed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:47
+#: src/cmdline/cmdline_action.cc:237
 #, c-format
 msgid ""
 "Note: \"%s\", providing the virtual package\n"
 "      \"%s\", is already going to be installed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:65
+#: src/cmdline/cmdline_action.cc:255
 #, 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:71
+#: src/cmdline/cmdline_action.cc:261
 #, c-format
 msgid "\"%s\" is a virtual package provided by:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:74
+#: src/cmdline/cmdline_action.cc:264
 #, c-format
 msgid "You must choose one to install.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:79
+#: src/cmdline/cmdline_action.cc:269
 #, c-format
 msgid ""
 "Note: selecting \"%s\" instead of the\n"
 "      virtual package \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:97
+#: src/cmdline/cmdline_action.cc:287
 #, c-format
 msgid "%s is already installed at the requested version (%s)\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:103
+#: src/cmdline/cmdline_action.cc:293
 #, c-format
 msgid "%s is not currently installed, so it will not be reinstalled.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:110 src/cmdline/cmdline_action.cc:116
+#: src/cmdline/cmdline_action.cc:300 src/cmdline/cmdline_action.cc:306
 #, c-format
 msgid "Package %s is not installed, so it will not be removed\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:134
+#: src/cmdline/cmdline_action.cc:324
 #, c-format
 msgid "Package %s is not installed, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:136
+#: src/cmdline/cmdline_action.cc:326
 #, c-format
 msgid "Package %s is not upgradable, cannot forbid an upgrade\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:216
+#: src/cmdline/cmdline_action.cc:417
 #, c-format
 msgid "Note: selecting the task \"%s: %s\" for installation\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:246
+#: src/cmdline/cmdline_action.cc:450
 #, c-format
 msgid ""
 "You can only specify a package version with an 'install' command or a "
 "'forbid-version' command.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:254
+#: src/cmdline/cmdline_action.cc:459
 #, c-format
 msgid "You can only specify a package archive with an 'install' command.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:288
+#: src/cmdline/cmdline_action.cc:495
 #, 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:291
+#: src/cmdline/cmdline_action.cc:498
 #, 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:315
+#: src/cmdline/cmdline_action.cc:520
 #, c-format
 msgid "Couldn't find any package whose name or description matched \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:317
+#: src/cmdline/cmdline_action.cc:522
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\", and more than 40\n"
 "packages contain \"%s\" in their description.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:320
+#: src/cmdline/cmdline_action.cc:525
 #, c-format
 msgid ""
 "Couldn't find any package matching \"%s\".  However, the following\n"
 "packages contain \"%s\" in their description:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_action.cc:440
+#: src/cmdline/cmdline_action.cc:660
 #, c-format
 msgid "Bad action character '%c'\n"
 msgstr ""
 
-#: src/cmdline/cmdline_changelog.cc:209
+#: src/cmdline/cmdline_changelog.cc:96
 msgid "Can't execute sensible-pager, is this a working Debian system?"
 msgstr ""
 
-#: src/cmdline/cmdline_changelog.cc:265
+#: src/cmdline/cmdline_changelog.cc:154
 #, c-format
 msgid "%s is not an official Debian package, cannot display its changelog."
 msgstr ""
 
-#: src/cmdline/cmdline_changelog.cc:343
+#: src/cmdline/cmdline_changelog.cc:235
 #, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr ""
@@ -687,17 +726,23 @@ msgstr "S'alliberaran %sB de l'espai de disc"
 msgid "Freed %sB of disk space\n"
 msgstr "S'alliberaran %sB de l'espai de disc"
 
-#: src/cmdline/cmdline_do_action.cc:74
+#: src/cmdline/cmdline_do_action.cc:82
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:146
+#: src/cmdline/cmdline_do_action.cc:158
 msgid "Unexpected pattern argument following \"keep-all\""
 msgstr ""
 
-#: src/cmdline/cmdline_do_action.cc:263 src/cmdline/cmdline_simulate.cc:31
-#: src/cmdline/cmdline_upgrade.cc:230 src/main.cc:552
+#: src/cmdline/cmdline_do_action.cc:264
+#, c-format
+msgid ""
+"Unable to safely resolve dependencies, try running with --full-resolver.\n"
+msgstr ""
+
+#: src/cmdline/cmdline_do_action.cc:301 src/cmdline/cmdline_simulate.cc:33
+#: src/cmdline/cmdline_upgrade.cc:149 src/main.cc:681
 #, c-format
 msgid "Abort.\n"
 msgstr ""
@@ -934,184 +979,184 @@ msgstr ""
 msgid "Unrecognized input.  Enter either \"%s\" or \"%s\".\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:616
+#: src/cmdline/cmdline_prompt.cc:620
 #, 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:622
+#: src/cmdline/cmdline_prompt.cc:626
 #, c-format
 msgid "The following packages are SUGGESTED but will NOT be installed:\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:627
+#: src/cmdline/cmdline_prompt.cc:631
 #, c-format
 msgid "No packages will be installed, upgraded, or removed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:629
+#: src/cmdline/cmdline_prompt.cc:633
 #, c-format
 msgid "%lu packages upgraded, %lu newly installed, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:633
+#: src/cmdline/cmdline_prompt.cc:637
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:635
+#: src/cmdline/cmdline_prompt.cc:639
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:637
+#: src/cmdline/cmdline_prompt.cc:641
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:644
+#: src/cmdline/cmdline_prompt.cc:648
 #, c-format
 msgid "Need to get %sB/%sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:647
+#: src/cmdline/cmdline_prompt.cc:651
 #, c-format
 msgid "Need to get %sB of archives. "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:654
+#: src/cmdline/cmdline_prompt.cc:658
 #, c-format
 msgid "After unpacking %sB will be used.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:657
+#: src/cmdline/cmdline_prompt.cc:661
 #, c-format
 msgid "After unpacking %sB will be freed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:678
+#: src/cmdline/cmdline_prompt.cc:682
 #, c-format
 msgid "No packages to show -- enter the package names on the line after 'i'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:684
+#: src/cmdline/cmdline_prompt.cc:688
 msgid "Press Return to continue."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:695
+#: src/cmdline/cmdline_prompt.cc:699
 #, c-format
 msgid "No packages found -- enter the package names on the line after 'c'.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:699
+#: src/cmdline/cmdline_prompt.cc:703
 msgid "Press Return to continue"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:709
+#: src/cmdline/cmdline_prompt.cc:713
 #, 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:732
+#: src/cmdline/cmdline_prompt.cc:736
 #, c-format
 msgid "y: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:734
+#: src/cmdline/cmdline_prompt.cc:738
 msgid "continue with the installation"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:736
+#: src/cmdline/cmdline_prompt.cc:740
 #, c-format
 msgid "n: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:738
+#: src/cmdline/cmdline_prompt.cc:742
 msgid "abort and quit"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:740
+#: src/cmdline/cmdline_prompt.cc:744
 #, c-format
 msgid "i: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:742
+#: src/cmdline/cmdline_prompt.cc:746
 msgid ""
 "show information about one or more packages; the package names should follow "
 "the 'i'"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:744
+#: src/cmdline/cmdline_prompt.cc:748
 #, c-format
 msgid "c: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:746
+#: src/cmdline/cmdline_prompt.cc:750
 msgid ""
 "show the Debian changelogs of one or more packages; the package names should "
 "follow the 'c'"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:748
+#: src/cmdline/cmdline_prompt.cc:752
 #, c-format
 msgid "d: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:750
+#: src/cmdline/cmdline_prompt.cc:754
 msgid "toggle the display of dependency information"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:752
+#: src/cmdline/cmdline_prompt.cc:756
 #, c-format
 msgid "s: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:754
+#: src/cmdline/cmdline_prompt.cc:758
 #, fuzzy
 msgid "toggle the display of changes in package sizes"
 msgstr "Oblik prikaza za poglede paketa"
 
-#: src/cmdline/cmdline_prompt.cc:756
+#: src/cmdline/cmdline_prompt.cc:760
 #, c-format
 msgid "v: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:758
+#: src/cmdline/cmdline_prompt.cc:762
 msgid "toggle the display of version numbers"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:760
+#: src/cmdline/cmdline_prompt.cc:764
 #, c-format
 msgid "w: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:762
+#: src/cmdline/cmdline_prompt.cc:766
 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:765
+#: src/cmdline/cmdline_prompt.cc:769
 #, c-format
 msgid "r: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:767
+#: src/cmdline/cmdline_prompt.cc:771
 msgid "run the automatic dependency resolver to fix the broken dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:769
+#: src/cmdline/cmdline_prompt.cc:773
 #, c-format
 msgid "e: %F"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:771
+#: src/cmdline/cmdline_prompt.cc:775
 msgid "enter the full visual interface"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:774
+#: src/cmdline/cmdline_prompt.cc:778
 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 "
@@ -1119,73 +1164,77 @@ msgid ""
 "The following actions are available:"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:781 src/cmdline/cmdline_resolver.cc:200
+#: src/cmdline/cmdline_prompt.cc:785 src/cmdline/cmdline_resolver.cc:204
 #, fuzzy
 msgid "'+' to install packages"
 msgstr "Automatski nadogradi instalirane pakete"
 
-#: src/cmdline/cmdline_prompt.cc:784 src/cmdline/cmdline_resolver.cc:202
+#: src/cmdline/cmdline_prompt.cc:788 src/cmdline/cmdline_resolver.cc:206
 #, 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:786 src/cmdline/cmdline_resolver.cc:204
+#: src/cmdline/cmdline_prompt.cc:790 src/cmdline/cmdline_resolver.cc:208
 msgid "'-' to remove packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:788 src/cmdline/cmdline_resolver.cc:206
+#: src/cmdline/cmdline_prompt.cc:792 src/cmdline/cmdline_resolver.cc:210
 msgid "'_' to purge packages"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:790 src/cmdline/cmdline_resolver.cc:208
+#: src/cmdline/cmdline_prompt.cc:794 src/cmdline/cmdline_resolver.cc:212
 msgid "'=' to place packages on hold"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:792 src/cmdline/cmdline_resolver.cc:210
+#: src/cmdline/cmdline_prompt.cc:796 src/cmdline/cmdline_resolver.cc:214
 msgid ""
 "':' to keep packages in their current state without placing them on hold"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:794 src/cmdline/cmdline_resolver.cc:212
+#: src/cmdline/cmdline_prompt.cc:798 src/cmdline/cmdline_resolver.cc:216
 #, fuzzy
 msgid "'&M' to mark packages as automatically installed"
 msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
 
-#: src/cmdline/cmdline_prompt.cc:796 src/cmdline/cmdline_resolver.cc:214
+#: src/cmdline/cmdline_prompt.cc:800 src/cmdline/cmdline_resolver.cc:218
 msgid "'&m' to mark packages as manually installed"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:800
+#: src/cmdline/cmdline_prompt.cc:802
+msgid "'&BD' to install the build-dependencies of a package."
+msgstr ""
+
+#: src/cmdline/cmdline_prompt.cc:806
 #, fuzzy
 msgid "Commands:"
 msgstr "Preporučuje"
 
-#: src/cmdline/cmdline_prompt.cc:892
+#: src/cmdline/cmdline_prompt.cc:913
 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:910
+#: src/cmdline/cmdline_prompt.cc:931
 msgid "Do you want to continue? [Y/n/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:911
+#: src/cmdline/cmdline_prompt.cc:932
 msgid "Resolve these dependencies by hand? [N/+/-/_/:/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:929
+#: src/cmdline/cmdline_prompt.cc:950
 msgid "Invalid response.  Please enter a valid command or '?' for help.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:935
+#: src/cmdline/cmdline_prompt.cc:956
 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:966
+#: src/cmdline/cmdline_prompt.cc:987
 #, c-format
 msgid ""
 "\n"
@@ -1193,7 +1242,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:968
+#: src/cmdline/cmdline_prompt.cc:989
 #, c-format
 msgid ""
 "\n"
@@ -1201,7 +1250,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:974
+#: src/cmdline/cmdline_prompt.cc:995
 #, c-format
 msgid ""
 "\n"
@@ -1209,7 +1258,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:976
+#: src/cmdline/cmdline_prompt.cc:997
 #, c-format
 msgid ""
 "\n"
@@ -1217,7 +1266,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:981
+#: src/cmdline/cmdline_prompt.cc:1002
 #, c-format
 msgid ""
 "\n"
@@ -1225,7 +1274,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_prompt.cc:983
+#: src/cmdline/cmdline_prompt.cc:1004
 #, c-format
 msgid ""
 "\n"
@@ -1233,223 +1282,261 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:90 src/cmdline/cmdline_resolver.cc:701
+#: src/cmdline/cmdline_resolver.cc:91 src/cmdline/cmdline_resolver.cc:712
 #: src/generic/apt/apt.cc:287
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:96 src/cmdline/cmdline_resolver.cc:706
+#: src/cmdline/cmdline_resolver.cc:97 src/cmdline/cmdline_resolver.cc:717
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:98 src/cmdline/cmdline_resolver.cc:708
+#: src/cmdline/cmdline_resolver.cc:99 src/cmdline/cmdline_resolver.cc:719
 msgid "Resolver state successfully written!"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:161
+#: src/cmdline/cmdline_resolver.cc:162
 #, c-format
 msgid ""
-"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
+"y: %Fn: %Fq: %F,: %F.: %Fo: %Fe: %Fx: %Fr pkg ver ...: %F%na pkg ver ...: %F%"
 "n<ACTION> pkg... : %F%n%F%F%F%F%F%F%F%F"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:180
+#: src/cmdline/cmdline_resolver.cc:182
 msgid "accept the proposed changes"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:182
+#: src/cmdline/cmdline_resolver.cc:184
 msgid "reject the proposed changes and search for another solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:184
+#: src/cmdline/cmdline_resolver.cc:186
 msgid "give up and quit the program"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:186
+#: src/cmdline/cmdline_resolver.cc:188
 msgid "move to the next solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:188
+#: src/cmdline/cmdline_resolver.cc:190
 msgid "move to the previous solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:190
+#: src/cmdline/cmdline_resolver.cc:192
 msgid ""
 "toggle between the contents of the solution and an explanation of the "
 "solution"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:192
+#: src/cmdline/cmdline_resolver.cc:194
 msgid "examine the solution in the visual user interface"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:194
+#: src/cmdline/cmdline_resolver.cc:196
+msgid ""
+"abort automatic dependency resolution; resolve dependencies by hand instead"
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:198
 msgid ""
 "reject the given package versions; don't display any solutions in which they "
 "occur."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:196
+#: src/cmdline/cmdline_resolver.cc:200
 msgid ""
 "accept the given package versions; display only solutions in which they "
 "occur."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:198
+#: src/cmdline/cmdline_resolver.cc:202
 msgid "adjust the state of the listed packages, where ACTION is one of:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:216
+#: src/cmdline/cmdline_resolver.cc:220
 msgid ""
 "Adjustments will cause the current solution to be discarded and recalculated "
 "as necessary."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:230
+#: src/cmdline/cmdline_resolver.cc:234
 #, c-format
 msgid "The version %s is available in the following archives:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:238
+#: src/cmdline/cmdline_resolver.cc:242
 #, c-format
 msgid "Select the version of %s that should be used: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:245
+#: src/cmdline/cmdline_resolver.cc:249
 #, c-format
 msgid "Invalid response.  Please enter an integer between 1 and %d."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:260
+#: src/cmdline/cmdline_resolver.cc:264
 #, c-format
 msgid "Expected at least one package/version pair following '%c'"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:274
+#: src/cmdline/cmdline_resolver.cc:278
 #, c-format
 msgid "Expected a version or \"%s\" after \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:284
+#: src/cmdline/cmdline_resolver.cc:288
 #, c-format
 msgid "No such package \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:300
+#: src/cmdline/cmdline_resolver.cc:304
 #, c-format
 msgid "%s has no version named \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:317
+#: src/cmdline/cmdline_resolver.cc:321
 #, c-format
 msgid "Allowing the removal of %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:320
+#: src/cmdline/cmdline_resolver.cc:324
 #, c-format
 msgid "Allowing the installation of %s version %s (%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:330
+#: src/cmdline/cmdline_resolver.cc:334
 #, c-format
 msgid "Rejecting the removal of %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:333
+#: src/cmdline/cmdline_resolver.cc:337
 #, c-format
 msgid "Rejecting the installation of %s version %s (%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:346
+#: src/cmdline/cmdline_resolver.cc:350
 #, c-format
 msgid "No longer requiring the removal of %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:349
+#: src/cmdline/cmdline_resolver.cc:353
 #, c-format
 msgid "No longer requiring the installation of %s version %s (%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:358
+#: src/cmdline/cmdline_resolver.cc:362
 #, c-format
 msgid "Requiring the removal of %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:361
+#: src/cmdline/cmdline_resolver.cc:365
 #, c-format
 msgid "Requiring the installation of %s version %s (%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:503
+#: src/cmdline/cmdline_resolver.cc:507
 #, c-format
 msgid ""
 "Would resolve dependencies, but dependency resolution is disabled.\n"
 "   (%s::ProblemResolver::StepLimit = 0)\n"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:512
+#: src/cmdline/cmdline_resolver.cc:516
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:525 src/solution_dialog.cc:127
-#: src/solution_screen.cc:514
+#: src/cmdline/cmdline_resolver.cc:529 src/solution_dialog.cc:127
+#: src/solution_screen.cc:519
 msgid "Resolving dependencies..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:557 src/solution_screen.cc:510
+#: src/cmdline/cmdline_resolver.cc:561 src/solution_screen.cc:515
 #, c-format
 msgid "open: %d; closed: %d; defer: %d; conflict: %d"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:607
+#: src/cmdline/cmdline_resolver.cc:614
 msgid "The following actions will resolve these dependencies:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:624
+#: src/cmdline/cmdline_resolver.cc:631
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:651 src/cmdline/cmdline_resolver.cc:752
+#: src/cmdline/cmdline_resolver.cc:658 src/cmdline/cmdline_resolver.cc:763
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:681
+#: src/cmdline/cmdline_resolver.cc:661
+msgid ""
+"Abandoning automatic dependency resolution and reverting to manual "
+"resolution."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:691
 #, fuzzy
 msgid "The following commands are available:"
 msgstr "Slijedeći paketi su OŠTEĆENI:"
 
-#: src/cmdline/cmdline_resolver.cc:698
+#: src/cmdline/cmdline_resolver.cc:709
 msgid "File to write resolver state to: "
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:713
+#: src/cmdline/cmdline_resolver.cc:724
 msgid "Invalid response; please enter one of the following commands:"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:726
+#: src/cmdline/cmdline_resolver.cc:737
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:755
+#: src/cmdline/cmdline_resolver.cc:766
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:764
+#: src/cmdline/cmdline_resolver.cc:775
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:770
+#: src/cmdline/cmdline_resolver.cc:781
 msgid "*** No more solutions available ***"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:789
+#: src/cmdline/cmdline_resolver.cc:800
 msgid ""
 "*** ERROR: search aborted by fatal exception.  You may continue\n"
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
+#: src/cmdline/cmdline_resolver.cc:945
+msgid ""
+"The resolver timed out after producing a solution; some possible upgrades "
+"might not be performed."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:952
+msgid ""
+"Unable to resolve dependencies for the upgrade (the resolver timed out)."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:966
+msgid "Unable to resolve dependencies for the upgrade (no solution found)."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:975
+#, c-format
+msgid ""
+"Dependency resolution incomplete (%s); some possible upgrades might not be "
+"performed."
+msgstr ""
+
+#: src/cmdline/cmdline_resolver.cc:981
+#, c-format
+msgid "Unable to resolve dependencies for the upgrade (%s)."
+msgstr ""
+
 #: src/cmdline/cmdline_search.cc:122
 #, c-format
 msgid "iconv of %s failed.\n"
@@ -1572,7 +1659,7 @@ msgid "State"
 msgstr ""
 
 #: src/cmdline/cmdline_show.cc:350 src/cmdline/cmdline_show.cc:436
-#: src/generic/apt/matchers.cc:2270
+#: src/generic/apt/matchers.cc:2488
 msgid "Provided by"
 msgstr ""
 
@@ -1655,11 +1742,11 @@ msgstr "Zavisi"
 msgid "PreDepends"
 msgstr "Unaprijed zavisi"
 
-#: src/cmdline/cmdline_show.cc:423 src/cmdline/cmdline_why.cc:277
+#: src/cmdline/cmdline_show.cc:423 src/cmdline/cmdline_why.cc:278
 msgid "Recommends"
 msgstr "Preporučuje"
 
-#: src/cmdline/cmdline_show.cc:425 src/cmdline/cmdline_why.cc:280
+#: src/cmdline/cmdline_show.cc:425 src/cmdline/cmdline_why.cc:281
 msgid "Suggests"
 msgstr "Predlaže"
 
@@ -1679,8 +1766,8 @@ msgstr "Zamjenjuje"
 msgid "Obsoletes"
 msgstr "Zastarijeva"
 
-#: src/cmdline/cmdline_show.cc:435 src/cmdline/cmdline_why.cc:148
-#: src/generic/apt/matchers.cc:2216
+#: src/cmdline/cmdline_show.cc:435 src/cmdline/cmdline_why.cc:149
+#: src/generic/apt/matchers.cc:2434
 msgid "Provides"
 msgstr ""
 
@@ -1703,12 +1790,12 @@ msgstr ""
 msgid "Unable to parse pattern %s"
 msgstr ""
 
-#: src/cmdline/cmdline_simulate.cc:37
+#: src/cmdline/cmdline_simulate.cc:39
 #, c-format
 msgid "Would download/install/remove packages.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_simulate.cc:48
+#: src/cmdline/cmdline_simulate.cc:50
 msgid "Internal Error, Ordering didn't finish"
 msgstr ""
 
@@ -1722,212 +1809,233 @@ msgstr ""
 msgid "E: The update command takes no arguments\n"
 msgstr ""
 
-#: src/cmdline/cmdline_upgrade.cc:98
-msgid "Unable to resolve dependencies for the upgrade (resolver timed out)."
-msgstr ""
-
-#: src/cmdline/cmdline_upgrade.cc:104
-msgid "Unable to resolve dependencies for the upgrade (no solution found)."
+#: src/cmdline/cmdline_upgrade.cc:49
+#, c-format
+msgid "E: The %s command takes no arguments\n"
 msgstr ""
 
-#: src/cmdline/cmdline_upgrade.cc:110
+#: src/cmdline/cmdline_user_tag.cc:51
 #, c-format
-msgid "Unable to resolve dependencies for the upgrade (%s)."
+msgid "Adding user tag \"%s\" to the package \"%s\".\n"
 msgstr ""
 
-#: src/cmdline/cmdline_upgrade.cc:136
+#: src/cmdline/cmdline_user_tag.cc:58
+#, fuzzy, c-format
+msgid "Removing user tag \"%s\" from the package \"%s\".\n"
+msgstr "Ukloni zastarjele datoteke paketa nakon preuzimanja nove liste paketa"
+
+#: src/cmdline/cmdline_user_tag.cc:88
 #, c-format
-msgid "E: The %s command takes no arguments\n"
+msgid "%s: too few arguments; expected at least a tag name and a package.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:121
+#: src/cmdline/cmdline_user_tag.cc:115
+#, fuzzy, c-format
+msgid "No such package \"%s\".\n"
+msgstr "Paket:"
+
+#: src/cmdline/cmdline_util.cc:131
 #, c-format
 msgid "No candidate version found for %s\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:123
+#: src/cmdline/cmdline_util.cc:133
 #, c-format
 msgid "No current or candidate version found for %s\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:138
+#: src/cmdline/cmdline_util.cc:148
 #, c-format
 msgid "Unable to find an archive \"%s\" for the package \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:148
+#: src/cmdline/cmdline_util.cc:158
 #, c-format
 msgid "Unable to find a version \"%s\" for the package \"%s\"\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:154
+#: src/cmdline/cmdline_util.cc:164
 #, c-format
 msgid "Internal error: invalid value %i passed to cmdline_find_ver!\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:184
+#: src/cmdline/cmdline_util.cc:194
 #, c-format
 msgid "You cannot specify both an archive and a version for a package\n"
 msgstr ""
 
-#: src/cmdline/cmdline_util.cc:269
+#: src/cmdline/cmdline_util.cc:292
 #, c-format
 msgid "%d broken [%+d]"
 msgid_plural "%d broken [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:283
+#: src/cmdline/cmdline_util.cc:306
 #, c-format
 msgid "%d update [%+d]"
 msgid_plural "%d updates [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:297
+#: src/cmdline/cmdline_util.cc:320
 #, c-format
 msgid "%d new [%+d]"
 msgid_plural "%d new [%+d]"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/cmdline/cmdline_util.cc:308
+#: src/cmdline/cmdline_util.cc:331
 #, c-format
 msgid "There are now %F."
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:268
+#: src/cmdline/cmdline_util.cc:342
+#, 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:354
+#, c-format
+msgid "There is %d newly obsolete package: "
+msgid_plural "There are %d newly obsolete packages: "
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/cmdline/cmdline_why.cc:269
 msgid "dep_level"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:274
+#: src/cmdline/cmdline_why.cc:275
 #, fuzzy
 msgid "DependsOnly"
 msgstr "Zavisi"
 
-#: src/cmdline/cmdline_why.cc:288
+#: src/cmdline/cmdline_why.cc:289
 msgid "version_selection"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:293
+#: src/cmdline/cmdline_why.cc:294
 msgid "Current"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:296
+#: src/cmdline/cmdline_why.cc:297
 msgid "Candidate"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:299 src/generic/apt/matchers.cc:1377
+#: src/cmdline/cmdline_why.cc:300 src/generic/apt/matchers.cc:1595
 #, fuzzy
 msgid "Install"
 msgstr "Automatski nadogradi instalirane pakete"
 
-#: src/cmdline/cmdline_why.cc:307
+#: src/cmdline/cmdline_why.cc:308
 msgid "allow_choices"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:310
+#: src/cmdline/cmdline_why.cc:311
 msgid "true"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:312
+#: src/cmdline/cmdline_why.cc:313
 msgid "false"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:421
+#: src/cmdline/cmdline_why.cc:422
 #, fuzzy, c-format
 msgid "Install(%s)"
 msgstr "Automatski nadogradi instalirane pakete"
 
-#: src/cmdline/cmdline_why.cc:423
+#: src/cmdline/cmdline_why.cc:424
 #, c-format
 msgid "Remove(%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:425
+#: src/cmdline/cmdline_why.cc:426
 #, c-format
 msgid "Install(%s provides %s)"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:429
+#: src/cmdline/cmdline_why.cc:430
 #, c-format
 msgid "Remove(%s provides %s)"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:604
+#: src/cmdline/cmdline_why.cc:605
 #, c-format
 msgid "    ++ Examining %F\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:614
+#: src/cmdline/cmdline_why.cc:615
 msgid "    ++   --> skipping, not a conflict\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:624
+#: src/cmdline/cmdline_why.cc:625
 msgid "    ++   --> skipping conflict\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:632
+#: src/cmdline/cmdline_why.cc:633
 msgid "    ++   --> skipping, not relevant according to params\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:639
+#: src/cmdline/cmdline_why.cc:640
 msgid "    ++   --> skipping, parent is not the selected version\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:668
+#: src/cmdline/cmdline_why.cc:669
 msgid "    ++   --> ENQUEUING\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:675
+#: src/cmdline/cmdline_why.cc:676
 msgid "    ++   --> skipping, version check failed\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:693
+#: src/cmdline/cmdline_why.cc:694
 #, c-format
 msgid "    ++   --> ENQUEUING %s Provides %s\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:824
+#: src/cmdline/cmdline_why.cc:825
 #, c-format
 msgid "Starting search with parameters %ls\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1002
+#: src/cmdline/cmdline_why.cc:1003
 msgid "Skipping this solution, I've already seen it.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1014
+#: src/cmdline/cmdline_why.cc:1015
 #, c-format
 msgid "The package \"%s\" is a starting point of the search.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1073
+#: src/cmdline/cmdline_why.cc:1074
 #, c-format
 msgid "No justification for removing %s could be constructed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1075
+#: src/cmdline/cmdline_why.cc:1076
 #, c-format
 msgid "No justification for %s could be constructed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1120 src/cmdline/cmdline_why.cc:1146
-#: src/cmdline/cmdline_why.cc:1208
+#: src/cmdline/cmdline_why.cc:1121 src/cmdline/cmdline_why.cc:1147
+#: src/cmdline/cmdline_why.cc:1209
 #, fuzzy, c-format
 msgid "No package named \"%s\" exists."
 msgstr "Automatski prikazuj zašto su paketi oštećeni"
 
-#: src/cmdline/cmdline_why.cc:1154
+#: src/cmdline/cmdline_why.cc:1155
 msgid "Unable to parse some match patterns."
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1181
+#: src/cmdline/cmdline_why.cc:1182
 #, c-format
 msgid "%s: this command requires at least one argument (the package to query)."
 msgstr ""
 
-#: src/cmdline/cmdline_why.cc:1230
+#: src/cmdline/cmdline_why.cc:1231
 #, fuzzy, c-format
 msgid "The package \"%s\" is manually installed.\n"
 msgstr "Slijedeći NOVI paketi će biti automatski instalirani:"
@@ -1944,6 +2052,10 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
+#: src/desc_parse.cc:334
+msgid "User Tags"
+msgstr ""
+
 #: src/download_item.cc:80 src/download_item.cc:84 src/download_item.cc:106
 #: src/generic/apt/acqprogress.cc:248
 #, c-format
@@ -2058,70 +2170,77 @@ msgid ""
 "press [Enter].\n"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:294
+#: src/generic/apt/aptcache.cc:266
+#, c-format
+msgid ""
+"Error parsing a user-tag for the package %s: unexpected end-of-line "
+"following %s."
+msgstr ""
+
+#: src/generic/apt/aptcache.cc:283
+#, c-format
+msgid "Unterminated '\"' in the user-tags list of the package %s."
+msgstr ""
+
+#: src/generic/apt/aptcache.cc:387
 msgid "Can't open Aptitude extended state file"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:308 src/generic/apt/aptcache.cc:388
-#: src/generic/apt/aptcache.cc:390
+#: src/generic/apt/aptcache.cc:401 src/generic/apt/aptcache.cc:489
+#: src/generic/apt/aptcache.cc:491
 msgid "Reading extended state information"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:395 src/generic/apt/aptcache.cc:477
-#: src/generic/apt/aptcache.cc:480
+#: src/generic/apt/aptcache.cc:496 src/generic/apt/aptcache.cc:578
+#: src/generic/apt/aptcache.cc:581
 msgid "Initializing package states"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:608
+#: src/generic/apt/aptcache.cc:709
 msgid "Cannot open Aptitude state file"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:612 src/generic/apt/aptcache.cc:673
-#: src/generic/apt/aptcache.cc:676
+#: src/generic/apt/aptcache.cc:713 src/generic/apt/aptcache.cc:819
+#: src/generic/apt/aptcache.cc:822
 msgid "Writing extended state information"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:655
-#, c-format
-msgid "Internal buffer overflow on package \"%s\" while writing state file"
-msgstr ""
-
-#: src/generic/apt/aptcache.cc:664
+#: src/generic/apt/aptcache.cc:810
 msgid "Couldn't write state file"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:681
+#: src/generic/apt/aptcache.cc:827
 msgid "Error writing state file"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:699
+#: src/generic/apt/aptcache.cc:845
 #, c-format
 msgid "failed to remove %s"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:706
+#: src/generic/apt/aptcache.cc:852
 #, c-format
 msgid "failed to rename %s to %s"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:714
+#: src/generic/apt/aptcache.cc:860
 #, c-format
 msgid "couldn't replace %s with %s"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:1205
+#: src/generic/apt/aptcache.cc:1457
 msgid "Unable to correct dependencies, some packages cannot be installed"
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:1521
+#: src/generic/apt/aptcache.cc:1773
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:1528
+#: src/generic/apt/aptcache.cc:1780
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: src/generic/apt/aptcache.cc:1531
+#: src/generic/apt/aptcache.cc:1783
 msgid "You may want to update the package lists to correct these missing files"
 msgstr ""
 
@@ -2205,67 +2324,68 @@ msgstr ""
 msgid "fork() failed: %s"
 msgstr ""
 
-#: src/generic/apt/download_update_manager.cc:261
+#: src/generic/apt/download_update_manager.cc:262
 #, c-format
 msgid "waitpid() failed: %s"
 msgstr ""
 
-#: src/generic/apt/download_update_manager.cc:285
+#: src/generic/apt/download_update_manager.cc:286
 msgid "Couldn't clean out list directories"
 msgstr ""
 
-#: src/generic/apt/download_update_manager.cc:297
+#: src/generic/apt/download_update_manager.cc:298
 msgid "Couldn't rebuild package cache"
 msgstr ""
 
-#: src/generic/apt/download_update_manager.cc:312
+#: src/generic/apt/download_update_manager.cc:313
 msgid "The debtags command must not be an empty string."
 msgstr ""
 
-#: src/generic/apt/download_update_manager.cc:316
+#: src/generic/apt/download_update_manager.cc:317
 msgid "The debtags command must be an absolute path."
 msgstr ""
 
-#: src/generic/apt/download_update_manager.cc:325
+#: src/generic/apt/download_update_manager.cc:326
 #, c-format
 msgid ""
 "The debtags command (%s) does not exist; perhaps you need to install the "
 "debtags package?"
 msgstr ""
 
-#: src/generic/apt/download_update_manager.cc:328
+#: src/generic/apt/download_update_manager.cc:329
 #, c-format
 msgid "The debtags command (%s) cannot be executed: %s"
 msgstr ""
 
-#: src/generic/apt/download_update_manager.cc:333
+#: src/generic/apt/download_update_manager.cc:334
 msgid "Updating debtags database..."
 msgstr ""
 
-#: src/generic/apt/download_update_manager.cc:350
+#: src/generic/apt/download_update_manager.cc:351
 msgid "(core dumped)"
 msgstr ""
 
-#: src/generic/apt/download_update_manager.cc:352
+#: src/generic/apt/download_update_manager.cc:353
 #, c-format
-msgid "The debtags update process (%s %s) was killed by signal %d%s."
+msgid "The debtags update process (%s update %s) was killed by signal %d%s."
 msgstr ""
 
-#: src/generic/apt/download_update_manager.cc:359
+#: src/generic/apt/download_update_manager.cc:360
 #, c-format
-msgid "The debtags update process (%s %s) exited abnormally (code %d)."
+msgid "The debtags update process (%s update %s) exited abnormally (code %d)."
 msgstr ""
 
-#: src/generic/apt/download_update_manager.cc:365
+#: src/generic/apt/download_update_manager.cc:366
 #, c-format
 msgid ""
-"The debtags update process (%s %s) exited in an unexpected way (status %d)."
+"The debtags update process (%s update %s) exited in an unexpected way "
+"(status %d)."
 msgstr ""
 
-#: src/generic/apt/download_update_manager.cc:370
+#: src/generic/apt/download_update_manager.cc:371
 #, c-format
 msgid ""
-"Updating the debtags database (%s %s) failed (perhaps debtags is not "
+"Updating the debtags database (%s update %s) failed (perhaps debtags is not "
 "installed?): %s"
 msgstr ""
 
@@ -2378,170 +2498,170 @@ msgid ""
 "Log complete.\n"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1126
+#: src/generic/apt/matchers.cc:1344
 #, fuzzy
 msgid "Automatically Installed"
 msgstr "Automatski nadogradi instalirane pakete"
 
-#: src/generic/apt/matchers.cc:1154 src/generic/apt/matchers.cc:1361
+#: src/generic/apt/matchers.cc:1372 src/generic/apt/matchers.cc:1579
 msgid "Broken"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1359
+#: src/generic/apt/matchers.cc:1577
 msgid "Unchanged"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1363
+#: src/generic/apt/matchers.cc:1581
 msgid "Remove [unused]"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1365
+#: src/generic/apt/matchers.cc:1583
 msgid "Hold [auto]"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1367
+#: src/generic/apt/matchers.cc:1585
 msgid "Install [auto]"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1369
+#: src/generic/apt/matchers.cc:1587
 msgid "Remove [auto]"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1371
+#: src/generic/apt/matchers.cc:1589
 msgid "Downgrade"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1373
+#: src/generic/apt/matchers.cc:1591
 msgid "Hold"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1375
+#: src/generic/apt/matchers.cc:1593
 msgid "Reinstall"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1379
+#: src/generic/apt/matchers.cc:1597
 msgid "Remove"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1381
+#: src/generic/apt/matchers.cc:1599
 msgid "Upgrade"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1407
+#: src/generic/apt/matchers.cc:1625
 msgid "Keep"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1439
+#: src/generic/apt/matchers.cc:1657
 msgid "Virtual"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1466
+#: src/generic/apt/matchers.cc:1684
 #, fuzzy
 msgid "Installed"
 msgstr "Automatski nadogradi instalirane pakete"
 
-#: src/generic/apt/matchers.cc:1494
+#: src/generic/apt/matchers.cc:1712
 #, fuzzy
 msgid "Essential"
 msgstr "Essencial: "
 
-#: src/generic/apt/matchers.cc:1519
+#: src/generic/apt/matchers.cc:1737
 msgid "Config Files Remain"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:1956
+#: src/generic/apt/matchers.cc:2174
 msgid "Garbage"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:2325
+#: src/generic/apt/matchers.cc:2543
 msgid "No reverse dependencies"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:2403
+#: src/generic/apt/matchers.cc:2621
 #, fuzzy
 msgid "New Package"
 msgstr "Paket:"
 
-#: src/generic/apt/matchers.cc:2428
+#: src/generic/apt/matchers.cc:2646
 msgid "Upgradable"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:2453
+#: src/generic/apt/matchers.cc:2671
 #, fuzzy
 msgid "Obsolete"
 msgstr "Zastarijeva"
 
-#: src/generic/apt/matchers.cc:2892
+#: src/generic/apt/matchers.cc:3110
 #, c-format
 msgid "Unknown action type: %s"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:2933
+#: src/generic/apt/matchers.cc:3151
 #, c-format
 msgid "Unterminated literal string after %s"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:3030
+#: src/generic/apt/matchers.cc:3248
 #, c-format
 msgid "Unknown priority %s"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:3049
+#: src/generic/apt/matchers.cc:3267
 #, c-format
 msgid "Match pattern ends unexpectedly (expected '%c')."
 msgstr ""
 
-#: src/generic/apt/matchers.cc:3052
+#: src/generic/apt/matchers.cc:3270
 #, c-format
 msgid "Expected '%c', got '%c'."
 msgstr ""
 
-#: src/generic/apt/matchers.cc:3359 src/generic/apt/matchers.cc:3791
-#: src/generic/apt/matchers.cc:3834
+#: src/generic/apt/matchers.cc:3577 src/generic/apt/matchers.cc:4015
+#: src/generic/apt/matchers.cc:4058
 #, c-format
 msgid "Unknown dependency type: %s"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:3413
+#: src/generic/apt/matchers.cc:3631
 #, c-format
 msgid "Unknown matcher type: \"%s\"."
 msgstr ""
 
 #. ForTranslators: Question marks ("?") are used as prefix for function names.
 #. Leave the question marks attached to the string placeholders.
-#: src/generic/apt/matchers.cc:3424 src/generic/apt/matchers.cc:3433
+#: src/generic/apt/matchers.cc:3642 src/generic/apt/matchers.cc:3651
 #, c-format
 msgid ""
 "The ?%s matcher must be used in a \"wide\" context (a top-level context, or "
 "a context enclosed by ?%s)."
 msgstr ""
 
-#: src/generic/apt/matchers.cc:3644
+#: src/generic/apt/matchers.cc:3868
 msgid "Unmatched '('"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:3797
+#: src/generic/apt/matchers.cc:4021
 msgid "Provides: cannot be broken"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:3860
+#: src/generic/apt/matchers.cc:4084
 #, c-format
 msgid "Unknown pattern type: %c"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:3883
+#: src/generic/apt/matchers.cc:4107
 msgid "Can't search for \"\""
 msgstr ""
 
-#: src/generic/apt/matchers.cc:3915
+#: src/generic/apt/matchers.cc:4139
 msgid "Unexpected empty expression"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:3948
+#: src/generic/apt/matchers.cc:4172
 msgid "Badly formed expression"
 msgstr ""
 
-#: src/generic/apt/matchers.cc:3987
+#: src/generic/apt/matchers.cc:4211
 msgid "Unexpected ')'"
 msgstr ""
 
@@ -2852,343 +2972,355 @@ msgstr ""
 msgid "Invalid sorting policy type '%s'"
 msgstr ""
 
-#: src/main.cc:86
+#: src/main.cc:88
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr ""
 
-#: src/main.cc:95
+#: src/main.cc:97
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 
-#: src/main.cc:103
+#: src/main.cc:105
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr ""
 
-#: src/main.cc:106
+#: src/main.cc:108
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr ""
 
-#: src/main.cc:109
+#: src/main.cc:111
 #, c-format
 msgid ""
 "\n"
 "NCurses version: %s\n"
 msgstr ""
 
-#: src/main.cc:111
+#: src/main.cc:113
 #, c-format
 msgid ""
 "\n"
 "Curses version: %s\n"
 msgstr ""
 
-#: src/main.cc:113
+#: src/main.cc:115
 #, c-format
 msgid "libsigc++ version: %s\n"
 msgstr ""
 
-#: src/main.cc:115
+#: src/main.cc:117
 #, c-format
 msgid "Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:117
+#: src/main.cc:119
 #, c-format
 msgid "Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:124
+#: src/main.cc:126
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr ""
 
-#: src/main.cc:126
+#: src/main.cc:128
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr ""
 
-#: src/main.cc:128
+#: src/main.cc:130
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
 "\n"
 msgstr ""
 
-#: src/main.cc:129
+#: src/main.cc:131
 #, c-format
 msgid " install      - Install/upgrade packages\n"
 msgstr ""
 
-#: src/main.cc:130
+#: src/main.cc:132
 #, c-format
 msgid " remove       - Remove packages\n"
 msgstr ""
 
-#: src/main.cc:131
+#: src/main.cc:133
 #, c-format
 msgid " purge        - Remove packages and their configuration files\n"
 msgstr ""
 
-#: src/main.cc:132
+#: src/main.cc:134
 #, c-format
 msgid " hold         - Place packages on hold\n"
 msgstr ""
 
-#: src/main.cc:133
+#: src/main.cc:135
 #, c-format
 msgid " unhold       - Cancel a hold command for a package\n"
 msgstr ""
 
-#: src/main.cc:134
+#: src/main.cc:136
 #, c-format
 msgid " markauto     - Mark packages as having been automatically installed\n"
 msgstr ""
 
-#: src/main.cc:135
+#: src/main.cc:137
 #, c-format
 msgid " unmarkauto   - Mark packages as having been manually installed\n"
 msgstr ""
 
-#: src/main.cc:140
+#: src/main.cc:142
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
 "version.\n"
 msgstr ""
 
-#: src/main.cc:141
+#: src/main.cc:143
 #, c-format
 msgid " update       - Download lists of new/upgradable packages\n"
 msgstr ""
 
-#: src/main.cc:142
+#: src/main.cc:144
 #, c-format
 msgid " safe-upgrade - Perform a safe upgrade\n"
 msgstr ""
 
-#: src/main.cc:143
+#: src/main.cc:145
 #, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
 "packages\n"
 msgstr ""
 
-#: src/main.cc:144
+#: src/main.cc:146
 #, c-format
 msgid " forget-new   - Forget what packages are \"new\"\n"
 msgstr ""
 
-#: src/main.cc:145
+#: src/main.cc:147
 #, c-format
 msgid " search       - Search for a package by name and/or expression\n"
 msgstr ""
 
-#: src/main.cc:146
+#: src/main.cc:148
 #, c-format
 msgid " show         - Display detailed information about a package\n"
 msgstr ""
 
-#: src/main.cc:147
+#: src/main.cc:149
 #, c-format
 msgid " clean        - Erase downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:148
+#: src/main.cc:150
 #, c-format
 msgid " autoclean    - Erase old downloaded package files\n"
 msgstr ""
 
-#: src/main.cc:149
+#: src/main.cc:151
 #, c-format
 msgid " changelog    - View a package's changelog\n"
 msgstr ""
 
-#: src/main.cc:150
+#: src/main.cc:152
 #, c-format
 msgid " download     - Download the .deb file for a package\n"
 msgstr ""
 
-#: src/main.cc:151
+#: src/main.cc:153
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package\n"
 msgstr ""
 
-#: src/main.cc:153
+#: src/main.cc:155
 #, c-format
 msgid "  Options:\n"
 msgstr ""
 
-#: src/main.cc:154
+#: src/main.cc:156
 #, c-format
 msgid " -h             This help text\n"
 msgstr ""
 
-#: src/main.cc:155
+#: src/main.cc:157
 #, c-format
 msgid " -s             Simulate actions, but do not actually perform them.\n"
 msgstr ""
 
-#: src/main.cc:156
+#: src/main.cc:158
 #, c-format
 msgid ""
 " -d             Only download packages, do not install or remove anything.\n"
 msgstr ""
 
-#: src/main.cc:157
+#: src/main.cc:159
 #, c-format
 msgid " -P             Always prompt for confirmation or actions\n"
 msgstr ""
 
-#: src/main.cc:158
+#: src/main.cc:160
 #, c-format
 msgid ""
 " -y             Assume that the answer to simple yes/no questions is 'yes'\n"
 msgstr ""
 
-#: src/main.cc:159
+#: src/main.cc:161
 #, c-format
 msgid ""
 " -F format      Specify a format for displaying search results; see the "
 "manual\n"
 msgstr ""
 
-#: src/main.cc:160
+#: src/main.cc:162
 #, c-format
 msgid ""
 " -O order       Specify how search results should be sorted; see the manual\n"
 msgstr ""
 
-#: src/main.cc:161
+#: src/main.cc:163
 #, c-format
 msgid ""
 " -w width       Specify the display width for formatting search results\n"
 msgstr ""
 
-#: src/main.cc:162
+#: src/main.cc:164
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr ""
 
-#: src/main.cc:163
+#: src/main.cc:165
 #, c-format
 msgid " -V             Show which versions of packages are to be installed.\n"
 msgstr ""
 
-#: src/main.cc:164
+#: src/main.cc:166
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr ""
 
-#: src/main.cc:165
+#: src/main.cc:167
 #, c-format
 msgid " -Z             Show the change in installed size of each package.\n"
 msgstr ""
 
-#: src/main.cc:166
+#: src/main.cc:168
 #, c-format
 msgid ""
 " -v             Display extra information. (may be supplied multiple times)\n"
 msgstr ""
 
-#: src/main.cc:167
+#: src/main.cc:169
 #, c-format
 msgid ""
 " -t [release]   Set the release from which packages should be installed\n"
 msgstr ""
 
-#: src/main.cc:168
+#: src/main.cc:170
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress "
 "indicators.\n"
 msgstr ""
 
-#: src/main.cc:169
+#: src/main.cc:171
 #, c-format
 msgid " -o key=val     Directly set the configuration option named 'key'\n"
 msgstr ""
 
-#: src/main.cc:170
+#: src/main.cc:172
 #, c-format
 msgid ""
 " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
 "                strong dependencies\n"
 msgstr ""
 
-#: src/main.cc:171
+#: src/main.cc:173
 #, c-format
 msgid " -S fname       Read the aptitude extended status info from fname.\n"
 msgstr ""
 
-#: src/main.cc:172
+#: src/main.cc:174
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr ""
 
-#: src/main.cc:173
+#: src/main.cc:175
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr ""
 
-#: src/main.cc:175
+#: src/main.cc:177
 #, c-format
 msgid "                  This aptitude does not have Super Cow Powers.\n"
 msgstr ""
 
-#: src/main.cc:319
+#: src/main.cc:358
 #, c-format
 msgid "Expected a number after -q=\n"
 msgstr ""
 
-#: src/main.cc:328
+#: src/main.cc:367
 #, c-format
 msgid "Expected a number after -q=, got %s\n"
 msgstr ""
 
-#: src/main.cc:352
+#: src/main.cc:391
+#, c-format
+msgid "-o requires an argument of the form key=value, got %s\n"
+msgstr ""
+
+#: src/main.cc:480
 #, c-format
-msgid "-o requires an argument of the form key=value, got %s"
+msgid "No comma following tag name \"%s\".\n"
 msgstr ""
 
-#: src/main.cc:403 src/main.cc:412
+#: src/main.cc:508 src/main.cc:517
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr ""
 
-#: src/main.cc:429
+#: src/main.cc:534
 msgid "Only one of -u and -i may be specified\n"
 msgstr ""
 
-#: src/main.cc:437
+#: src/main.cc:542
 msgid ""
 "-u and -i may not be specified in command-line mode (eg, with 'install')"
 msgstr ""
 
-#: src/main.cc:458
+#: src/main.cc:563
 msgid "-u and -i may not be specified with a command"
 msgstr ""
 
-#: src/main.cc:545
+#: src/main.cc:622
+#, c-format
+msgid ""
+"The options --safe-resolver and --full-resolver are not meaningful\n"
+"for %s, which always uses the safe resolver.\n"
+msgstr ""
+
+#: src/main.cc:674
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr ""
 
-#: src/main.cc:557 src/main.cc:606
+#: src/main.cc:686 src/main.cc:735
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr ""
 
-#: src/main.cc:561 src/main.cc:610
+#: src/main.cc:690 src/main.cc:739
 #, c-format
 msgid ""
 "Backtrace:\n"
-"%s"
+"%s\n"
 msgstr ""
 
 #: src/menu_text_layout.cc:43 src/menu_tree.cc:220 src/view_changelog.cc:60
@@ -3407,7 +3539,7 @@ msgstr ""
 msgid "30 6 6 1 1 40 10 10 11 10 35 9 10 2 1 1 10 12 30 15 15"
 msgstr ""
 
-#: src/pkg_columnizer.cc:88 src/ui.cc:2491
+#: src/pkg_columnizer.cc:88 src/ui.cc:2515
 msgid "Package"
 msgstr ""
 
@@ -4216,7 +4348,7 @@ msgid ""
 "broken if it is %s."
 msgstr ""
 
-#: src/solution_dialog.cc:97 src/solution_screen.cc:473
+#: src/solution_dialog.cc:97 src/solution_screen.cc:478
 msgid "The package cache is not available."
 msgstr ""
 
@@ -4225,7 +4357,7 @@ msgstr ""
 msgid "No packages are broken."
 msgstr "Automatski prikazuj zašto su paketi oštećeni"
 
-#: src/solution_dialog.cc:114 src/solution_screen.cc:496
+#: src/solution_dialog.cc:114 src/solution_screen.cc:501
 msgid "No resolution found."
 msgstr ""
 
@@ -4383,37 +4515,37 @@ msgstr "Slijedeći paketi su OŠTEĆENI:"
 msgid "The following actions will resolve this dependency:"
 msgstr ""
 
-#: src/solution_screen.cc:243
+#: src/solution_screen.cc:248
 #, fuzzy
 msgid "Remove the following packages:"
 msgstr "Slijedeći paketi su OŠTEĆENI:"
 
-#: src/solution_screen.cc:254
+#: src/solution_screen.cc:259
 #, fuzzy
 msgid "Keep the following packages at their current version:"
 msgstr "Slijedeći paketi su OŠTEĆENI:"
 
-#: src/solution_screen.cc:265
+#: src/solution_screen.cc:270
 #, fuzzy
 msgid "Install the following packages:"
 msgstr "Slijedeći paketi su OŠTEĆENI:"
 
-#: src/solution_screen.cc:276
+#: src/solution_screen.cc:281
 #, fuzzy
 msgid "Upgrade the following packages:"
 msgstr "Slijedeći paketi su OŠTEĆENI:"
 
-#: src/solution_screen.cc:287
+#: src/solution_screen.cc:292
 #, fuzzy
 msgid "Downgrade the following packages:"
 msgstr "Slijedeći paketi su OŠTEĆENI:"
 
-#: src/solution_screen.cc:300
+#: src/solution_screen.cc:305
 #, fuzzy
 msgid "Leave the following recommendations unresolved:"
 msgstr "Slijedeći paketi su OŠTEĆENI:"
 
-#: src/solution_screen.cc:480
+#: src/solution_screen.cc:485
 #, fuzzy
 msgid "No broken packages."
 msgstr "Paket:"
@@ -4492,7 +4624,7 @@ msgstr ""
 msgid "Preferences"
 msgstr "Unaprijed zavisi"
 
-#: src/ui.cc:692 src/ui.cc:2257
+#: src/ui.cc:692 src/ui.cc:2281
 msgid "Change the behavior of aptitude"
 msgstr ""
 
@@ -4535,7 +4667,7 @@ msgstr ""
 msgid "License"
 msgstr ""
 
-#: src/ui.cc:1017 src/ui.cc:2349
+#: src/ui.cc:1017 src/ui.cc:2373
 msgid "View the terms under which you may copy and distribute aptitude"
 msgstr ""
 
@@ -4555,7 +4687,7 @@ msgstr ""
 msgid "View a brief introduction to aptitude"
 msgstr ""
 
-#: src/ui.cc:1046 src/ui.cc:2496
+#: src/ui.cc:1046 src/ui.cc:2520
 msgid "Help"
 msgstr ""
 
@@ -4583,7 +4715,7 @@ msgstr ""
 msgid "FAQ"
 msgstr ""
 
-#: src/ui.cc:1076 src/ui.cc:2341
+#: src/ui.cc:1076 src/ui.cc:2365
 msgid "View a list of frequently asked questions"
 msgstr ""
 
@@ -4591,7 +4723,7 @@ msgstr ""
 msgid "News"
 msgstr ""
 
-#: src/ui.cc:1086 src/ui.cc:2345
+#: src/ui.cc:1086 src/ui.cc:2369
 #, fuzzy, c-format
 msgid "View the important changes made in each version of %s"
 msgstr "Oblik prikaza za poglede paketa"
@@ -4731,7 +4863,7 @@ msgid ""
 "currently do not have.  Would you like to change to the root account?"
 msgstr ""
 
-#: src/ui.cc:1547 src/ui.cc:2108
+#: src/ui.cc:1547 src/ui.cc:2124
 msgid "Waste time trying to find mines"
 msgstr ""
 
@@ -4770,514 +4902,524 @@ msgstr ""
 msgid "Ran out of time while trying to find a solution."
 msgstr ""
 
-#: src/ui.cc:2011 src/ui.cc:2013
+#: src/ui.cc:2027 src/ui.cc:2029
 msgid "Resolve Dependencies"
 msgstr ""
 
-#: src/ui.cc:2012
+#: src/ui.cc:2028
 msgid "Search for solutions to unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:2024
+#: src/ui.cc:2040
 #, c-format
 msgid "Unable to open %ls"
 msgstr ""
 
-#: src/ui.cc:2030
+#: src/ui.cc:2046
 msgid "Error while dumping resolver state"
 msgstr ""
 
-#: src/ui.cc:2040
+#: src/ui.cc:2056
 msgid "File to which the resolver state should be dumped:"
 msgstr ""
 
-#: src/ui.cc:2070
+#: src/ui.cc:2086
 msgid "^Install/remove packages"
 msgstr ""
 
-#: src/ui.cc:2071
+#: src/ui.cc:2087
 msgid "Perform all pending installs and removals"
 msgstr ""
 
-#: src/ui.cc:2073
+#: src/ui.cc:2089
 msgid "^Update package list"
 msgstr ""
 
-#: src/ui.cc:2074
+#: src/ui.cc:2090
 msgid "Check for new versions of packages"
 msgstr ""
 
-#: src/ui.cc:2078
+#: src/ui.cc:2094
 msgid "Mark Up^gradable"
 msgstr ""
 
-#: src/ui.cc:2079
+#: src/ui.cc:2095
 msgid "Mark all upgradable packages which are not held for upgrade"
 msgstr ""
 
-#: src/ui.cc:2083
+#: src/ui.cc:2099
 msgid "^Forget new packages"
 msgstr ""
 
-#: src/ui.cc:2084
+#: src/ui.cc:2100
 msgid "Forget which packages are \"new\""
 msgstr ""
 
-#: src/ui.cc:2087
+#: src/ui.cc:2103
 msgid "Canc^el pending actions"
 msgstr ""
 
-#: src/ui.cc:2088
+#: src/ui.cc:2104
 msgid "Cancel all pending installations, removals, holds, and upgrades."
 msgstr ""
 
-#: src/ui.cc:2091
+#: src/ui.cc:2107
 msgid "^Clean package cache"
 msgstr ""
 
-#: src/ui.cc:2092
+#: src/ui.cc:2108
 msgid "Delete package files which were previously downloaded"
 msgstr ""
 
-#: src/ui.cc:2095
+#: src/ui.cc:2111
 msgid "Clean ^obsolete files"
 msgstr ""
 
-#: src/ui.cc:2096
+#: src/ui.cc:2112
 msgid "Delete package files which can no longer be downloaded"
 msgstr ""
 
-#: src/ui.cc:2102
+#: src/ui.cc:2118
 msgid "^Reload package cache"
 msgstr ""
 
-#: src/ui.cc:2103
+#: src/ui.cc:2119
 msgid "Reload the package cache"
 msgstr ""
 
-#: src/ui.cc:2107
+#: src/ui.cc:2123
 msgid "^Play Minesweeper"
 msgstr ""
 
-#: src/ui.cc:2112
+#: src/ui.cc:2128
 msgid "^Become root"
 msgstr ""
 
-#: src/ui.cc:2113
+#: src/ui.cc:2129
 msgid ""
 "Run 'su' to become root; this will restart the program, but your settings "
 "will be preserved"
 msgstr ""
 
-#: src/ui.cc:2115
+#: src/ui.cc:2131
 msgid "^Quit"
 msgstr ""
 
-#: src/ui.cc:2116
+#: src/ui.cc:2132
 msgid "Exit the program"
 msgstr ""
 
-#: src/ui.cc:2122 src/ui.cc:2490
+#: src/ui.cc:2138 src/ui.cc:2514
 msgid "Undo"
 msgstr ""
 
-#: src/ui.cc:2123
+#: src/ui.cc:2139
 msgid "Undo the last package operation or group of operations"
 msgstr ""
 
-#: src/ui.cc:2131
+#: src/ui.cc:2147
 msgid "^Install"
 msgstr ""
 
-#: src/ui.cc:2132
+#: src/ui.cc:2148
 msgid "Flag the currently selected package for installation or upgrade"
 msgstr ""
 
-#: src/ui.cc:2135
+#: src/ui.cc:2151
 msgid "^Remove"
 msgstr ""
 
-#: src/ui.cc:2136
+#: src/ui.cc:2152
 msgid "Flag the currently selected package for removal"
 msgstr ""
 
-#: src/ui.cc:2139
+#: src/ui.cc:2155
 msgid "^Purge"
 msgstr ""
 
-#: src/ui.cc:2140
+#: src/ui.cc:2156
 msgid ""
 "Flag the currently selected package and its configuration files for removal"
 msgstr ""
 
-#: src/ui.cc:2143
+#: src/ui.cc:2159
 msgid "^Keep"
 msgstr ""
 
-#: src/ui.cc:2144
+#: src/ui.cc:2160
 msgid "Cancel any action on the selected package"
 msgstr ""
 
-#: src/ui.cc:2147
+#: src/ui.cc:2163
 msgid "^Hold"
 msgstr ""
 
-#: src/ui.cc:2148
+#: src/ui.cc:2164
 msgid ""
 "Cancel any action on the selected package, and protect it from future "
 "upgrades"
 msgstr ""
 
-#: src/ui.cc:2151
+#: src/ui.cc:2167
 msgid "Mark ^Auto"
 msgstr ""
 
-#: src/ui.cc:2152
+#: src/ui.cc:2168
 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:2155
+#: src/ui.cc:2171
 msgid "Mark ^Manual"
 msgstr ""
 
-#: src/ui.cc:2156
+#: src/ui.cc:2172
 msgid ""
 "Mark the selected package as having been manually installed; it will not be "
 "removed unless you manually remove it"
 msgstr ""
 
-#: src/ui.cc:2159
+#: src/ui.cc:2175
 msgid "^Forbid Version"
 msgstr ""
 
-#: src/ui.cc:2160
+#: src/ui.cc:2176
 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:2164
+#: src/ui.cc:2180
 msgid "I^nformation"
 msgstr ""
 
-#: src/ui.cc:2165
+#: src/ui.cc:2181
 msgid "Display more information about the selected package"
 msgstr ""
 
-#: src/ui.cc:2168
+#: src/ui.cc:2184
 #, fuzzy
 msgid "^Changelog"
 msgstr "Poništi"
 
-#: src/ui.cc:2169
+#: src/ui.cc:2185
 msgid "Display the Debian changelog of the selected package"
 msgstr ""
 
-#: src/ui.cc:2176
+#: src/ui.cc:2192
 msgid "^Examine Solution"
 msgstr ""
 
-#: src/ui.cc:2177
+#: src/ui.cc:2193
 msgid "Examine the currently selected solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2180
+#: src/ui.cc:2196
 msgid "Apply ^Solution"
 msgstr ""
 
-#: src/ui.cc:2181
+#: src/ui.cc:2197
 msgid "Perform the actions contained in the currently selected solution."
 msgstr ""
 
-#: src/ui.cc:2184
+#: src/ui.cc:2200
 msgid "^Next Solution"
 msgstr ""
 
-#: src/ui.cc:2185
+#: src/ui.cc:2201
 msgid "Select the next solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2188
+#: src/ui.cc:2204
 msgid "^Previous Solution"
 msgstr ""
 
-#: src/ui.cc:2189
+#: src/ui.cc:2205
 msgid "Select the previous solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2192
+#: src/ui.cc:2208
 msgid "^First Solution"
 msgstr ""
 
-#: src/ui.cc:2193
+#: src/ui.cc:2209
 msgid "Select the first solution to the dependency problems."
 msgstr ""
 
-#: src/ui.cc:2196
+#: src/ui.cc:2212
 msgid "^Last Solution"
 msgstr ""
 
-#: src/ui.cc:2197
+#: src/ui.cc:2213
 msgid ""
 "Select the last solution to the dependency problems that has been generated "
 "so far."
 msgstr ""
 
-#: src/ui.cc:2203
+#: src/ui.cc:2219
 msgid "Toggle ^Rejected"
 msgstr ""
 
-#: src/ui.cc:2204
+#: src/ui.cc:2220
 msgid "Toggle whether the currently selected action is rejected."
 msgstr ""
 
-#: src/ui.cc:2208
+#: src/ui.cc:2224
 msgid "Toggle ^Approved"
 msgstr ""
 
-#: src/ui.cc:2209
+#: src/ui.cc:2225
 msgid "Toggle whether the currently selected action is approved."
 msgstr ""
 
-#: src/ui.cc:2213
+#: src/ui.cc:2229
 msgid "^View Target"
 msgstr ""
 
-#: src/ui.cc:2214
+#: src/ui.cc:2230
 msgid "View the package which will be affected by the selected action"
 msgstr ""
 
-#: src/ui.cc:2222
+#: src/ui.cc:2236
+msgid "Reject Breaking ^Holds"
+msgstr ""
+
+#: src/ui.cc:2238
+msgid ""
+"Reject all actions that would change the state of held packages or install "
+"forbidden versions"
+msgstr ""
+
+#: src/ui.cc:2246
 msgid "^Find"
 msgstr ""
 
-#: src/ui.cc:2223
+#: src/ui.cc:2247
 msgid "Search forwards"
 msgstr ""
 
-#: src/ui.cc:2226
+#: src/ui.cc:2250
 msgid "^Find Backwards"
 msgstr ""
 
-#: src/ui.cc:2227
+#: src/ui.cc:2251
 msgid "Search backwards"
 msgstr ""
 
-#: src/ui.cc:2230
+#: src/ui.cc:2254
 msgid "Find ^Again"
 msgstr ""
 
-#: src/ui.cc:2231
+#: src/ui.cc:2255
 msgid "Repeat the last search"
 msgstr ""
 
-#: src/ui.cc:2234
+#: src/ui.cc:2258
 msgid "Find Again ^Backwards"
 msgstr ""
 
-#: src/ui.cc:2235
+#: src/ui.cc:2259
 msgid "Repeat the last search in the opposite direction"
 msgstr ""
 
-#: src/ui.cc:2239
+#: src/ui.cc:2263
 msgid "^Limit Display"
 msgstr ""
 
-#: src/ui.cc:2240
+#: src/ui.cc:2264
 msgid "Apply a filter to the package list"
 msgstr ""
 
-#: src/ui.cc:2243
+#: src/ui.cc:2267
 msgid "^Un-Limit Display"
 msgstr ""
 
-#: src/ui.cc:2244
+#: src/ui.cc:2268
 #, fuzzy
 msgid "Remove the filter from the package list"
 msgstr "Ukloni zastarjele datoteke paketa nakon preuzimanja nove liste paketa"
 
-#: src/ui.cc:2248
+#: src/ui.cc:2272
 msgid "Find ^Broken"
 msgstr ""
 
-#: src/ui.cc:2249
+#: src/ui.cc:2273
 msgid "Find the next package with unsatisfied dependencies"
 msgstr ""
 
-#: src/ui.cc:2256
+#: src/ui.cc:2280
 #, fuzzy
 msgid "^Preferences"
 msgstr "Unaprijed zavisi"
 
-#: src/ui.cc:2261
+#: src/ui.cc:2285
 msgid "^UI options"
 msgstr ""
 
-#: src/ui.cc:2262
+#: src/ui.cc:2286
 msgid "Change the settings which affect the user interface"
 msgstr ""
 
-#: src/ui.cc:2265
+#: src/ui.cc:2289
 msgid "^Dependency handling"
 msgstr ""
 
-#: src/ui.cc:2266
+#: src/ui.cc:2290
 msgid "Change the settings which affect how package dependencies are handled"
 msgstr ""
 
-#: src/ui.cc:2269
+#: src/ui.cc:2293
 msgid "^Miscellaneous"
 msgstr ""
 
-#: src/ui.cc:2270
+#: src/ui.cc:2294
 msgid "Change miscellaneous program settings"
 msgstr ""
 
-#: src/ui.cc:2276
+#: src/ui.cc:2300
 msgid "^Revert options"
 msgstr ""
 
-#: src/ui.cc:2277
+#: src/ui.cc:2301
 msgid "Reset all settings to the system defaults"
 msgstr ""
 
-#: src/ui.cc:2288
+#: src/ui.cc:2312
 msgid "^Next"
 msgstr ""
 
-#: src/ui.cc:2289
+#: src/ui.cc:2313
 msgid "View next display"
 msgstr ""
 
-#: src/ui.cc:2292
+#: src/ui.cc:2316
 msgid "^Prev"
 msgstr ""
 
-#: src/ui.cc:2293
+#: src/ui.cc:2317
 msgid "View previous display"
 msgstr ""
 
-#: src/ui.cc:2296
+#: src/ui.cc:2320
 msgid "^Close"
 msgstr ""
 
-#: src/ui.cc:2297
+#: src/ui.cc:2321
 msgid "Close this display"
 msgstr ""
 
-#: src/ui.cc:2302
+#: src/ui.cc:2326
 msgid "New Package ^View"
 msgstr ""
 
-#: src/ui.cc:2303
+#: src/ui.cc:2327
 msgid "Create a new default package view"
 msgstr ""
 
-#: src/ui.cc:2306
+#: src/ui.cc:2330
 #, fuzzy
 msgid "Audit ^Recommendations"
 msgstr "Preporučuje"
 
-#: src/ui.cc:2307
+#: src/ui.cc:2331
 msgid ""
 "View packages which it is recommended that you install, but which are not "
 "currently installed."
 msgstr ""
 
-#: src/ui.cc:2310
+#: src/ui.cc:2334
 msgid "New ^Flat Package List"
 msgstr ""
 
-#: src/ui.cc:2311
+#: src/ui.cc:2335
 msgid "View all the packages on the system in a single uncategorized list"
 msgstr ""
 
-#: src/ui.cc:2314
+#: src/ui.cc:2338
 msgid "New ^Debtags Browser"
 msgstr ""
 
-#: src/ui.cc:2316
+#: src/ui.cc:2340
 msgid "Browse packages using Debtags data"
 msgstr ""
 
-#: src/ui.cc:2319
+#: src/ui.cc:2343
 msgid "New Categorical ^Browser"
 msgstr ""
 
-#: src/ui.cc:2321
+#: src/ui.cc:2345
 msgid "Browse packages by category"
 msgstr ""
 
-#: src/ui.cc:2329
+#: src/ui.cc:2353
 msgid "^About"
 msgstr ""
 
-#: src/ui.cc:2330
+#: src/ui.cc:2354
 msgid "View information about this program"
 msgstr ""
 
-#: src/ui.cc:2333
+#: src/ui.cc:2357
 msgid "^Help"
 msgstr ""
 
-#: src/ui.cc:2334
+#: src/ui.cc:2358
 msgid "View the on-line help"
 msgstr ""
 
-#: src/ui.cc:2336
+#: src/ui.cc:2360
 msgid "User's ^Manual"
 msgstr ""
 
-#: src/ui.cc:2337
+#: src/ui.cc:2361
 msgid "View the detailed program manual"
 msgstr ""
 
-#: src/ui.cc:2340
+#: src/ui.cc:2364
 msgid "^FAQ"
 msgstr ""
 
-#: src/ui.cc:2344
+#: src/ui.cc:2368
 msgid "^News"
 msgstr ""
 
-#: src/ui.cc:2348
+#: src/ui.cc:2372
 msgid "^License"
 msgstr ""
 
-#: src/ui.cc:2489
+#: src/ui.cc:2513
 msgid "Actions"
 msgstr ""
 
-#: src/ui.cc:2492
+#: src/ui.cc:2516
 msgid "Resolver"
 msgstr ""
 
-#: src/ui.cc:2493
+#: src/ui.cc:2517
 msgid "Search"
 msgstr ""
 
-#: src/ui.cc:2494
+#: src/ui.cc:2518
 msgid "Options"
 msgstr "Opcije"
 
-#: src/ui.cc:2495
+#: src/ui.cc:2519
 msgid "Views"
 msgstr ""
 
-#: src/ui.cc:2561
+#: src/ui.cc:2585
 #, c-format
 msgid ""
 "%ls: Menu  %ls: Help  %ls: Quit  %ls: Update  %ls: Download/Install/Remove "
 "Pkgs"
 msgstr ""
 
-#: src/ui.cc:2906
+#: src/ui.cc:2930
 msgid "yes_key"
 msgstr ""
 
-#: src/ui.cc:2907
+#: src/ui.cc:2931
 msgid "no_key"
 msgstr ""