Update pofiles.

1 files changed, 413 insertions, 227 deletions

diff --git a/po/nn.po b/po/nn.po
index 2a0930c8..b78561f4 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: 2010-01-20 20:39-0800\n"
+"POT-Creation-Date: 2010-04-18 08:07-0700\n"
 "PO-Revision-Date: 2005-06-27 21:26+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -770,7 +770,7 @@ msgstr ""
 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:376
+#: src/cmdline/cmdline_changelog.cc:382
 #, c-format
 msgid "Couldn't find a changelog for %s"
 msgstr "Klarte ikkje finna endringslogg for %s"
@@ -821,7 +821,7 @@ msgid ""
 msgstr "Klarer ikkje løysa pakkekrav."
 
 #: src/cmdline/cmdline_do_action.cc:349 src/cmdline/cmdline_simulate.cc:35
-#: src/main.cc:1111
+#: src/main.cc:1168
 #, c-format
 msgid "Abort.\n"
 msgstr "Avbryt.\n"
@@ -1424,18 +1424,18 @@ msgstr ""
 "Storleiksendringar vil ikkje bli vist.\n"
 "\n"
 
-#: src/cmdline/cmdline_resolver.cc:142 src/cmdline/cmdline_resolver.cc:973
+#: src/cmdline/cmdline_resolver.cc:142 src/cmdline/cmdline_resolver.cc:989
 #: src/generic/apt/apt.cc:290
 #, c-format
 msgid "Unable to open %s for writing"
 msgstr "Klarer ikkje opna %s for å skriva til ho"
 
-#: src/cmdline/cmdline_resolver.cc:148 src/cmdline/cmdline_resolver.cc:978
+#: src/cmdline/cmdline_resolver.cc:148 src/cmdline/cmdline_resolver.cc:994
 #, c-format
 msgid "Error writing resolver state to %s"
 msgstr "Feil ved skriving av løysingstilstand til %s"
 
-#: src/cmdline/cmdline_resolver.cc:150 src/cmdline/cmdline_resolver.cc:980
+#: src/cmdline/cmdline_resolver.cc:150 src/cmdline/cmdline_resolver.cc:996
 msgid "Resolver state successfully written!"
 msgstr ""
 
@@ -1549,67 +1549,67 @@ msgstr "Kjeldepakke: "
 msgid "%s has no version named \"%s\""
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:392
+#: src/cmdline/cmdline_resolver.cc:394
 #, c-format
 msgid "Allowing the removal of %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:395
+#: src/cmdline/cmdline_resolver.cc:397
 #, c-format
 msgid "Allowing the installation of %s version %s (%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:405
+#: src/cmdline/cmdline_resolver.cc:407
 #, c-format
 msgid "Rejecting the removal of %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:408
+#: src/cmdline/cmdline_resolver.cc:410
 #, c-format
 msgid "Rejecting the installation of %s version %s (%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:421
+#: src/cmdline/cmdline_resolver.cc:423
 #, c-format
 msgid "No longer requiring the removal of %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:424
+#: src/cmdline/cmdline_resolver.cc:426
 #, c-format
 msgid "No longer requiring the installation of %s version %s (%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:433
+#: src/cmdline/cmdline_resolver.cc:435
 #, c-format
 msgid "Requiring the removal of %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:436
+#: src/cmdline/cmdline_resolver.cc:438
 #, c-format
 msgid "Requiring the installation of %s version %s (%s)"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:485
+#: src/cmdline/cmdline_resolver.cc:487
 #, fuzzy, c-format
 msgid "Allowing this recommendation to be ignored: %s"
 msgstr "%BFjern%b desse pakkane: %n"
 
-#: src/cmdline/cmdline_resolver.cc:491
+#: src/cmdline/cmdline_resolver.cc:493
 #, fuzzy, c-format
 msgid "Always obeying this recommendation: %s"
 msgstr "Tilrådingar"
 
-#: src/cmdline/cmdline_resolver.cc:500
+#: src/cmdline/cmdline_resolver.cc:502
 #, c-format
 msgid "No longer ignoring this recommendation: %s"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:506
+#: src/cmdline/cmdline_resolver.cc:508
 #, fuzzy, c-format
 msgid "Ignoring this recommendation: %s"
 msgstr "Tilrådingar"
 
-#: src/cmdline/cmdline_resolver.cc:550
+#: src/cmdline/cmdline_resolver.cc:566
 #, fuzzy, c-format
 #| msgid "Actions"
 msgid "Action \"%s\""
@@ -1618,16 +1618,16 @@ msgstr "Handlingar"
 #. ForTranslators: the substitution is
 #. replaced in English with something
 #. like "Pkg1 depends upon Pkg2".
-#: src/cmdline/cmdline_resolver.cc:563
+#: src/cmdline/cmdline_resolver.cc:579
 #, c-format
 msgid "This action was selected because %ls."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:565
+#: src/cmdline/cmdline_resolver.cc:581
 msgid "This action is currently rejected; it will not appear in new solutions."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:566
+#: src/cmdline/cmdline_resolver.cc:582
 msgid ""
 "This action is currently approved; it will be selected whenever possible."
 msgstr ""
@@ -1637,7 +1637,7 @@ msgstr ""
 #. translated since the commands in
 #. aptitude's internal command-line
 #. aren't translated.
-#: src/cmdline/cmdline_resolver.cc:573
+#: src/cmdline/cmdline_resolver.cc:589
 #, c-format
 msgid "Enter \"r %s\" to allow this action to appear in new solutions."
 msgstr ""
@@ -1647,7 +1647,7 @@ msgstr ""
 #. translated since the commands in
 #. aptitude's internal command-line
 #. aren't translated.
-#: src/cmdline/cmdline_resolver.cc:579
+#: src/cmdline/cmdline_resolver.cc:595
 #, c-format
 msgid "Enter \"r %s\" to prevent this action from appearing in new solutions."
 msgstr ""
@@ -1657,7 +1657,7 @@ msgstr ""
 #. translated since the commands in
 #. aptitude's internal command-line
 #. aren't translated.
-#: src/cmdline/cmdline_resolver.cc:585
+#: src/cmdline/cmdline_resolver.cc:601
 #, c-format
 msgid ""
 "Enter \"a %s\" to cease requiring that new solutions include this action if "
@@ -1669,111 +1669,114 @@ msgstr ""
 #. translated since the commands in
 #. aptitude's internal command-line
 #. aren't translated.
-#: src/cmdline/cmdline_resolver.cc:591
+#: src/cmdline/cmdline_resolver.cc:607
 #, c-format
 msgid ""
 "Enter \"a %s\" to require that new solutions include this action if possible."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:763
+#: src/cmdline/cmdline_resolver.cc:779
 #, c-format
 msgid "open: %zd; closed: %zd; defer: %zd; conflict: %zd"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:786
+#: src/cmdline/cmdline_resolver.cc:802
 #, c-format
 msgid ""
 "Would resolve dependencies, but dependency resolution is disabled.\n"
 "   (%s::ProblemResolver::StepLimit = 0)\n"
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:795
+#: src/cmdline/cmdline_resolver.cc:811
 msgid "I want to resolve dependencies, but no dependency resolver was created."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:809 src/cmdline/cmdline_resolver.cc:1145
+#: src/cmdline/cmdline_resolver.cc:825 src/cmdline/cmdline_resolver.cc:1161
 #: src/gtk/resolver.cc:2056 src/solution_dialog.cc:127
 #: src/solution_screen.cc:546
 #, fuzzy
 msgid "Resolving dependencies..."
 msgstr "Klarer ikkje løysa pakkekrav."
 
-#: src/cmdline/cmdline_resolver.cc:868
+#: src/cmdline/cmdline_resolver.cc:884
 msgid "The following actions will resolve these dependencies:"
 msgstr "Desse handlingane vil løyse desse pakkekrava:"
 
 # Hugs [J]a, [n]ei, [a]vslutt
-#: src/cmdline/cmdline_resolver.cc:887
+#: src/cmdline/cmdline_resolver.cc:903
 msgid "Accept this solution? [Y/n/q/?] "
 msgstr "Vil du godta denne løysinga? [J/n/a/?] "
 
-#: src/cmdline/cmdline_resolver.cc:914 src/cmdline/cmdline_resolver.cc:1048
+#: src/cmdline/cmdline_resolver.cc:930 src/cmdline/cmdline_resolver.cc:1064
 msgid "Abandoning all efforts to resolve these dependencies."
 msgstr "Avbryt alt arbeid med å løyse desse pakkekrava."
 
-#: src/cmdline/cmdline_resolver.cc:917
+#: src/cmdline/cmdline_resolver.cc:933
 msgid ""
 "Abandoning automatic dependency resolution and reverting to manual "
 "resolution."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:950
+#: src/cmdline/cmdline_resolver.cc:966
 msgid "The following commands are available:"
 msgstr "Desse kommandoane er tilgjengelege:"
 
-#: src/cmdline/cmdline_resolver.cc:970
+#: src/cmdline/cmdline_resolver.cc:986
 msgid "File to write resolver state to: "
 msgstr "Fil for å skrive løysingstilstanden i: "
 
-#: src/cmdline/cmdline_resolver.cc:1002
+#: src/cmdline/cmdline_resolver.cc:1018
 msgid "Invalid response; please enter one of the following commands:"
 msgstr "Ugyldig respons. Skriv inn ein av dei følgjande kommandoane:"
 
-#: src/cmdline/cmdline_resolver.cc:1022
+#: src/cmdline/cmdline_resolver.cc:1038
 msgid "No solution found within the allotted time.  Try harder? [Y/n]"
 msgstr "Inga løysing funne innanfor den tildelte tida. Prøve hardare? [J/n]"
 
-#: src/cmdline/cmdline_resolver.cc:1051
+#: src/cmdline/cmdline_resolver.cc:1067
 msgid "Invalid response; please enter 'y' or 'n'."
 msgstr "Ugyldig respons. Skriv «j» eller «n»."
 
-#: src/cmdline/cmdline_resolver.cc:1060
+#: src/cmdline/cmdline_resolver.cc:1076
 msgid "Unable to resolve dependencies!  Giving up..."
 msgstr "Klarer ikkje løyse pakkekrava! Gjev opp ..."
 
-#: src/cmdline/cmdline_resolver.cc:1066
+#: src/cmdline/cmdline_resolver.cc:1082
 #, fuzzy
 msgid "*** No more solutions available ***"
 msgstr "Ingen fleire løysingar."
 
-#: src/cmdline/cmdline_resolver.cc:1085
+#: src/cmdline/cmdline_resolver.cc:1101
 msgid ""
 "*** ERROR: search aborted by fatal exception.  You may continue\n"
 "           searching, but some solutions will be unreachable."
 msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1161
-#, fuzzy
+#: src/cmdline/cmdline_resolver.cc:1172
+#, c-format
 msgid ""
-"Unable to resolve dependencies for the upgrade (the resolver timed out)."
-msgstr "Klarer ikkje løyse pakkekrava! Gjev opp ..."
+"Unable to resolve dependencies for the upgrade because the resolver timed "
+"out.\n"
+"  You may be able to solve this problem by increasing\n"
+"  Aptitude::ProblemResolver::StepLimit (currently %d)."
+msgstr ""
 
-#: src/cmdline/cmdline_resolver.cc:1167
+#: src/cmdline/cmdline_resolver.cc:1182
 #, fuzzy
-msgid "Unable to resolve dependencies for the upgrade (no solution found)."
+msgid "Unable to resolve dependencies for the upgrade: no solution found."
 msgstr "Klarer ikkje løyse pakkekrava! Gjev opp ..."
 
-#: src/cmdline/cmdline_resolver.cc:1173
+#: src/cmdline/cmdline_resolver.cc:1188
 #, fuzzy, c-format
-msgid "Unable to resolve dependencies for the upgrade (%s)."
+msgid "Unable to resolve dependencies for the upgrade: %s"
 msgstr "Klarer ikkje løysa pakkekrav."
 
-#: src/cmdline/cmdline_search.cc:126
+#: src/cmdline/cmdline_search.cc:145 src/cmdline/cmdline_versions.cc:500
 #, c-format
 msgid "iconv of %s failed.\n"
 msgstr ""
 
-#: src/cmdline/cmdline_search.cc:143
+#: src/cmdline/cmdline_search.cc:162
 #, 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"
@@ -1821,7 +1824,8 @@ msgid "The following packages have unmet dependencies:\n"
 msgstr "Desse pakkane hadde utilfredsstilte pakkekrav:\n"
 
 #: src/cmdline/cmdline_show.cc:172 src/cmdline/cmdline_show.cc:416
-#: src/gtk/resolver.cc:1193 src/solution_fragment.cc:68
+#: src/cmdline/cmdline_versions.cc:180 src/gtk/resolver.cc:1193
+#: src/solution_fragment.cc:68
 msgid "<NULL>"
 msgstr "<NULL>"
 
@@ -2163,6 +2167,68 @@ msgid_plural "There are %d newly obsolete packages: "
 msgstr[0] ""
 msgstr[1] ""
 
+#: src/cmdline/cmdline_versions.cc:97
+#, fuzzy, c-format
+#| msgid "Packages"
+msgid "Package %s:"
+msgstr "Pakkar"
+
+#: src/cmdline/cmdline_versions.cc:124 src/cmdline/cmdline_versions.cc:163
+#, fuzzy, c-format
+#| msgid "Source Package: "
+msgid "Source package %s:"
+msgstr "Kjeldepakke: "
+
+#: src/cmdline/cmdline_versions.cc:185
+#, fuzzy, c-format
+#| msgid "Archive"
+msgid "Archive %s:"
+msgstr "Arkiv"
+
+#: src/cmdline/cmdline_versions.cc:250
+#, fuzzy, c-format
+msgid "No such package \"%s\"."
+msgstr "Kjeldepakke: "
+
+#: src/cmdline/cmdline_versions.cc:438
+msgid "--group-by|archive"
+msgstr ""
+
+#: src/cmdline/cmdline_versions.cc:442
+msgid "--group-by|auto"
+msgstr ""
+
+#: src/cmdline/cmdline_versions.cc:446
+msgid "--group-by|none"
+msgstr ""
+
+#: src/cmdline/cmdline_versions.cc:450
+msgid "--group-by|package"
+msgstr ""
+
+#: src/cmdline/cmdline_versions.cc:454
+msgid "--group-by|source-package"
+msgstr ""
+
+#: src/cmdline/cmdline_versions.cc:458
+msgid "--group-by|source-version"
+msgstr ""
+
+#. ForTranslators: --group-by is the argument name and shouldn't
+#. be translated.
+#: src/cmdline/cmdline_versions.cc:464
+#, c-format
+msgid ""
+"Invalid package grouping mode \"%s\" (should be \"auto\", \"none\", \"package"
+"\", or \"source-package\")"
+msgstr ""
+
+#: src/cmdline/cmdline_versions.cc:517
+#, fuzzy, c-format
+#| msgid "search: You must provide at least one search term\n"
+msgid "versions: You must provide at least one package selector\n"
+msgstr "søk: Du må oppgje iallefall eitt søkje ord\n"
+
 #: src/cmdline/cmdline_why.cc:314
 #, fuzzy
 msgid "dep_level"
@@ -2549,88 +2615,66 @@ msgid ""
 "you make to the states of packages will NOT be preserved!"
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver.cc:460
+#: src/generic/apt/aptitude_resolver.cc:473
 #, c-format
 msgid "Invalid hint \"%s\": expected an action, but found nothing."
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver.cc:482
+#: src/generic/apt/aptitude_resolver.cc:497
 #, c-format
-msgid "Invalid hint \"%s\": expected a tier number, but found nothing."
+msgid ""
+"Invalid hint \"%s\": expected a component name and a number, but found "
+"nothing."
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver.cc:504
+#: src/generic/apt/aptitude_resolver.cc:516
 #, c-format
-msgid "Invalid hint \"%s\": expected a target, but found nothing."
+msgid ""
+"Invalid hint \"%s\": expected the numeric value following the component "
+"name, but found nothing."
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver.cc:531
+#: src/generic/apt/aptitude_resolver.cc:536
 #, c-format
-msgid "Invalid hint \"%s\": invalid target: %s"
+msgid "Invalid hint \"%s\": the numeric component \"%s\" cannot be parsed."
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver.cc:551
+#: src/generic/apt/aptitude_resolver.cc:547
 #, c-format
-msgid "Invalid hint \"%s\": trailing junk after the version."
+msgid "Invalid hint \"%s\": expected a level, but found nothing."
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver.cc:635
+#: src/generic/apt/aptitude_resolver.cc:569
 #, c-format
-msgid ""
-"Invalid hint \"%s\": the action \"%s\" should be \"approve\", \"reject\", or "
-"a number."
+msgid "Invalid hint \"%s\": expected a target, but found nothing."
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver_universe.cc:832
+#: src/generic/apt/aptitude_resolver.cc:596
 #, c-format
-msgid ""
-"Invalid search tier \"%s\" (not \"conflict\", \"minimum\", or an integer)."
+msgid "Invalid hint \"%s\": invalid target: %s"
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver_universe.cc:876
-#, fuzzy
-#| msgid "Section"
-msgid "Safe actions"
-msgstr "Seksjon"
-
-#: src/generic/apt/aptitude_resolver_universe.cc:877
-#, fuzzy
-msgid "Cancel all user actions"
-msgstr "Pakkar som krev %s"
-
-#: src/generic/apt/aptitude_resolver_universe.cc:878
-#, fuzzy
-#| msgid "'-' to remove packages"
-msgid "Remove packages"
-msgstr "- for å fjerne pakkar"
-
-#: src/generic/apt/aptitude_resolver_universe.cc:879
-#, fuzzy
-#| msgid "not a real package"
-msgid "Modify held packages"
-msgstr "ikkje ein verkeleg pakke"
-
-#: src/generic/apt/aptitude_resolver_universe.cc:880
-msgid "Install versions from non-default sources"
+#: src/generic/apt/aptitude_resolver.cc:616
+#, c-format
+msgid "Invalid hint \"%s\": trailing junk after the version."
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver_universe.cc:881
-#, fuzzy
-msgid "Remove essential packages"
-msgstr "%BFjern%b desse pakkane: %n"
-
-#: src/generic/apt/aptitude_resolver_universe.cc:914
+#: src/generic/apt/aptitude_resolver.cc:704
 #, c-format
 msgid ""
-"The tier \"%s\", configured in %s::ProblemResolver::Tier-Names, is missing a "
-"Tier entry."
+"Invalid hint \"%s\": the action \"%s\" should be \"approve\", \"reject\", or "
+"a number."
 msgstr ""
 
-#: src/generic/apt/aptitude_resolver_universe.cc:918
+#: src/generic/apt/aptitude_resolver_cost_settings.cc:130
+#, c-format
+msgid "Conflicting types for the cost component %s."
+msgstr ""
+
+#: src/generic/apt/aptitude_resolver_universe.cc:817
 #, c-format
 msgid ""
-"The tier %d, configured in %s::ProblemResolver::Tier-Names, is missing a "
-"Name entry."
+"Invalid safety level \"%s\" (not \"maximum\", \"minimum\", or an integer)."
 msgstr ""
 
 #: src/generic/apt/download_install_manager.cc:60
@@ -3023,16 +3067,22 @@ msgstr "Dårleg oppføring oppdaga (Pakke=%s, Gruppe=%s), hoppar over"
 msgid "Multiple descriptions found for group %s, ignoring one"
 msgstr "Fleire skildringar er funne for gruppe %s, ignorerar ei"
 
-#: src/generic/apt/resolver_manager.cc:484
+#: src/generic/apt/resolver_manager.cc:489
 #, c-format
 msgid "Unable to create the output file: child killed by signal %d."
 msgstr ""
 
-#: src/generic/apt/resolver_manager.cc:486
+#: src/generic/apt/resolver_manager.cc:491
 #, c-format
 msgid "Unable to create the output file: child exited with status %d."
 msgstr ""
 
+#: src/generic/apt/resolver_manager.cc:910
+#: src/generic/apt/resolver_manager.cc:912
+#, fuzzy, c-format
+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
 msgid "Building tag database"
 msgstr ""
@@ -3046,20 +3096,110 @@ msgstr "Ikkje i stand til å opna /usr/share/tasksel/debian-tasks.desc"
 msgid "Reading task descriptions"
 msgstr "Les oppgåveskildringar"
 
-#: src/generic/util/temp.cc:110 src/generic/util/temp.cc:184
-#, c-format
-msgid "Unable to create temporary directory from template \"%s\": %s"
+#: src/generic/problemresolver/exceptions.h:105
+msgid "Cost increments must be strictly positive."
+msgstr ""
+
+#: src/generic/problemresolver/exceptions.h:114
+msgid "The maximum cost value was exceeded."
 msgstr ""
 
-#: src/generic/util/temp.cc:261 src/generic/util/temp.cc:278
+#: src/generic/problemresolver/exceptions.h:124
+msgid "A single cost level was both added and lower-bounded."
+msgstr ""
+
+#: src/generic/util/parsers.h:735
 #, fuzzy, c-format
-msgid "Unable to create temporary filename from template \"%s\": %s"
+msgid "Expected '%s', but got EOF."
 msgstr "Klarer ikkje opna %s"
 
-#: src/generic/util/temp.cc:270
+#: src/generic/util/parsers.h:737
+#, fuzzy, c-format
+msgid "Expected '%s', but got '%s'."
+msgstr "Klarer ikkje opna %s"
+
+#: src/generic/util/parsers.h:778
 #, fuzzy
-msgid "Unknown error"
-msgstr "Ukjend"
+msgid "Expected any character, but got EOF."
+msgstr "Klarer ikkje opna %s"
+
+#: src/generic/util/parsers.h:791
+#, fuzzy
+#| msgid "Bad action character '%c'\n"
+msgid "any character"
+msgstr "Feil handlingsteikn «%c»\n"
+
+#: src/generic/util/parsers.h:832
+#, fuzzy, c-format
+msgid "Expected %s, but got EOF."
+msgstr "Klarer ikkje opna %s"
+
+#: src/generic/util/parsers.h:843
+#, fuzzy, c-format
+msgid "Expected %s, but got '%c'."
+msgstr "Klarer ikkje opna %s"
+
+#: src/generic/util/parsers.h:1017
+#, fuzzy
+msgid "Expected an integer, got EOF."
+msgstr "Klarer ikkje opna %s"
+
+#: src/generic/util/parsers.h:1026
+#, fuzzy
+msgid "Expected an integer following '-', got EOF."
+msgstr "Klarer ikkje opna %s"
+
+#: src/generic/util/parsers.h:1032
+#, fuzzy, c-format
+msgid "Expected an integer, got '%c'."
+msgstr "Klarer ikkje opna %s"
+
+#: src/generic/util/parsers.h:1046 src/generic/util/parsers.h:1054
+#, fuzzy, c-format
+#| msgid "Invalid operation %s"
+msgid "Invalid integer: \"%s\"."
+msgstr "Ugyldig operasjon %s"
+
+#: src/generic/util/parsers.h:1077
+#, fuzzy, c-format
+msgid "Expected EOF, got '%c'."
+msgstr "Klarer ikkje opna %s"
+
+#: src/generic/util/parsers.h:1191
+msgid "anything"
+msgstr ""
+
+#. ForTranslators: this is used to generate an error
+#. message; a brief description of what we expected to see
+#. is inserted into it.
+#: src/generic/util/parsers.h:1941 src/generic/util/parsers.h:2034
+#: src/generic/util/parsers.h:2085
+#, fuzzy, c-format
+#| msgid "Unexpected ')'"
+msgid "Expected %s"
+msgstr "Uventa «)»"
+
+#: src/generic/util/parsers.h:2007
+#, fuzzy
+#| msgid " or"
+msgid " or "
+msgstr " eller"
+
+#: src/generic/util/parsers.h:2762
+#, fuzzy, c-format
+#| msgid "Unexpected ')'"
+msgid "Unexpected %s"
+msgstr "Uventa «)»"
+
+#: src/generic/util/temp.cc:201 src/generic/util/temp.cc:275
+#, c-format
+msgid "Unable to create temporary directory from template \"%s\": %s"
+msgstr ""
+
+#: src/generic/util/temp.cc:342
+#, fuzzy, c-format
+msgid "Unable to create temporary filename from prefix \"%s\""
+msgstr "Klarer ikkje opna %s"
 
 #: src/generic/util/util.cc:346
 #, fuzzy, c-format
@@ -4802,10 +4942,11 @@ msgstr ""
 msgid "%u solutions."
 msgstr "Ingen fleire løysingar."
 
-#: src/gtk/resolver.cc:2108
-#, c-format
-msgid "Solution %s of %s (tier %s)."
-msgstr ""
+#: src/gtk/resolver.cc:2107
+#, fuzzy, c-format
+#| msgid "Could not open file \"%s\""
+msgid "Solution %s of %s."
+msgstr "Klarte ikkje opna fila «%s»"
 
 #: src/gtk/tab.cc:68
 #, fuzzy
@@ -5033,85 +5174,85 @@ msgstr "Ubalansert «(» i skildring av sorteringsmetode"
 msgid "Invalid sorting policy type '%s'"
 msgstr "Ugyldig type «%s» på sorteringsmetode"
 
-#: src/main.cc:108
+#: src/main.cc:111
 #, c-format
 msgid "Can't decode multibyte string after \"%ls\""
 msgstr ""
 
-#: src/main.cc:117
+#: src/main.cc:120
 #, c-format
 msgid "Can't decode wide-character string after \"%s\""
 msgstr ""
 
-#: src/main.cc:125
+#: src/main.cc:128
 #, c-format
 msgid "%s %s compiled at %s %s\n"
 msgstr "%s %s kompilert på %s %s\n"
 
-#: src/main.cc:128
+#: src/main.cc:131
 #, c-format
 msgid "Compiler: g++ %s\n"
 msgstr "Kompilator: g++ %s\n"
 
-#: src/main.cc:130
+#: src/main.cc:133
 #, fuzzy
 msgid "Compiled against:\n"
 msgstr "Kompilator: g++ %s\n"
 
-#: src/main.cc:131
+#: src/main.cc:134
 #, c-format
 msgid "  apt version %d.%d.%d\n"
 msgstr ""
 
-#: src/main.cc:134
+#: src/main.cc:137
 #, fuzzy, c-format
 msgid "  NCurses version: Unknown\n"
 msgstr ""
 "\n"
 "NCurses-versjon: %s\n"
 
-#: src/main.cc:136
+#: src/main.cc:139
 #, fuzzy, c-format
 msgid "  NCurses version %s\n"
 msgstr ""
 "\n"
 "NCurses-versjon: %s\n"
 
-#: src/main.cc:138
+#: src/main.cc:141
 #, fuzzy, c-format
 msgid "  libsigc++ version: %s\n"
 msgstr "«libsigc++»-versjon: %s\n"
 
-#: src/main.cc:140
+#: src/main.cc:143
 #, c-format
 msgid "  Ept support enabled.\n"
 msgstr ""
 
-#: src/main.cc:142
+#: src/main.cc:145
 #, c-format
 msgid "  Ept support disabled.\n"
 msgstr ""
 
-#: src/main.cc:145
+#: src/main.cc:148
 #, fuzzy, c-format
 msgid "  Gtk+ version %d.%d.%d\n"
 msgstr ""
 "\n"
 "Curses-versjon: %s\n"
 
-#: src/main.cc:147
+#: src/main.cc:150
 #, fuzzy, c-format
 msgid "  Gtk-- version %d.%d.%d\n"
 msgstr ""
 "\n"
 "Curses-versjon: %s\n"
 
-#: src/main.cc:150
+#: src/main.cc:153
 #, c-format
 msgid "  Gtk+ support disabled.\n"
 msgstr ""
 
-#: src/main.cc:153
+#: src/main.cc:156
 #, fuzzy
 msgid ""
 "\n"
@@ -5120,36 +5261,36 @@ msgstr ""
 "\n"
 "Curses-versjon: %s\n"
 
-#: src/main.cc:154
+#: src/main.cc:157
 #, fuzzy, c-format
 msgid "  NCurses version: %s\n"
 msgstr ""
 "\n"
 "NCurses-versjon: %s\n"
 
-#: src/main.cc:155
+#: src/main.cc:158
 #, fuzzy, c-format
 msgid "  cwidget version: %s\n"
 msgstr "«libsigc++»-versjon: %s\n"
 
-#: src/main.cc:156
+#: src/main.cc:159
 #, fuzzy, c-format
 msgid "  Apt version: %s\n"
 msgstr ""
 "\n"
 "Curses-versjon: %s\n"
 
-#: src/main.cc:162
+#: src/main.cc:165
 #, c-format
 msgid "Usage: aptitude [-S fname] [-u|-i]"
 msgstr "Bruk: aptitude [-S fnamn] [-u|-i]"
 
-#: src/main.cc:164
+#: src/main.cc:167
 #, c-format
 msgid "       aptitude [options] <action> ..."
 msgstr "       aptitude [val] <handling> ..."
 
-#: src/main.cc:166
+#: src/main.cc:169
 #, c-format
 msgid ""
 "  Actions (if none is specified, aptitude will enter interactive mode):\n"
@@ -5159,37 +5300,37 @@ msgstr ""
 "modus):\n"
 "\n"
 
-#: src/main.cc:167
+#: src/main.cc:170
 #, fuzzy, c-format
 #| msgid " install      - Install/upgrade packages\n"
 msgid " install      - Install/upgrade packages.\n"
 msgstr " install      - Installer/oppgrader pakkar\n"
 
-#: src/main.cc:168
+#: src/main.cc:171
 #, fuzzy, c-format
 #| msgid " remove       - Remove packages\n"
 msgid " remove       - Remove packages.\n"
 msgstr " remove       - Fjernar pakkar\n"
 
-#: src/main.cc:169
+#: src/main.cc:172
 #, fuzzy, c-format
 #| msgid " purge        - Remove packages and their configuration files\n"
 msgid " purge        - Remove packages and their configuration files.\n"
 msgstr " purge        - Fjernar pakkar og oppsettsfilene deira\n"
 
-#: src/main.cc:170
+#: src/main.cc:173
 #, fuzzy, c-format
 #| msgid " hold         - Place packages on hold\n"
 msgid " hold         - Place packages on hold.\n"
 msgstr " hold         - Legg pakkar på hald\n"
 
-#: src/main.cc:171
+#: src/main.cc:174
 #, 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       - Fjern ein hald-kommando for ein pakke\n"
 
-#: src/main.cc:172
+#: src/main.cc:175
 #, fuzzy, c-format
 #| msgid ""
 #| " markauto     - Mark packages as having been automatically installed\n"
@@ -5197,13 +5338,13 @@ 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:173
+#: src/main.cc:176
 #, 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   - Merk pakkar som at dei er installert manuelt\n"
 
-#: src/main.cc:174
+#: src/main.cc:177
 #, c-format
 msgid ""
 " forbid-version - Forbid aptitude from upgrading to a specific package "
@@ -5211,18 +5352,18 @@ msgid ""
 msgstr ""
 " forby versjon - Forby aptitude å oppgradere til ein særskild pakkeversjon.\n"
 
-#: src/main.cc:175
+#: src/main.cc:178
 #, fuzzy, c-format
 #| msgid " update       - Download lists of new/upgradable packages\n"
 msgid " update       - Download lists of new/upgradable packages.\n"
 msgstr " update       - Last ned liste over nye/oppgraderbare pakkar\n"
 
-#: src/main.cc:176
+#: src/main.cc:179
 #, fuzzy, c-format
 msgid " safe-upgrade - Perform a safe upgrade.\n"
 msgstr " upgrade      - Utfør ei trygg oppgradering\n"
 
-#: src/main.cc:177
+#: src/main.cc:180
 #, fuzzy, c-format
 msgid ""
 " full-upgrade - Perform an upgrade, possibly installing and removing "
@@ -5231,61 +5372,61 @@ msgstr ""
 " dist-upgrade - Utfør ei oppgradering, det kan vera pakkar blir installert "
 "og fjerna\n"
 
-#: src/main.cc:178
+#: src/main.cc:181
 #, c-format
 msgid " build-dep    - Install the build-dependencies of packages.\n"
 msgstr ""
 
-#: src/main.cc:179
+#: src/main.cc:182
 #, fuzzy, c-format
 #| msgid " forget-new   - Forget what packages are \"new\"\n"
 msgid " forget-new   - Forget what packages are \"new\".\n"
 msgstr " forget-new   - Gløym kva for pakkar som er «nye»\n"
 
-#: src/main.cc:180
+#: src/main.cc:183
 #, 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       - Søk etter ein pakke etter namn og/eller uttrykk\n"
 
-#: src/main.cc:181
+#: src/main.cc:184
 #, fuzzy, c-format
 #| msgid " show         - Display detailed information about a package\n"
 msgid " show         - Display detailed information about a package.\n"
 msgstr " show         - Vis detaljert informasjon om ei pakke\n"
 
-#: src/main.cc:182
+#: src/main.cc:185
 #, fuzzy, c-format
 #| msgid " clean        - Erase downloaded package files\n"
 msgid " clean        - Erase downloaded package files.\n"
 msgstr " clean        - Slett nedlasta pakkefiler\n"
 
-#: src/main.cc:183
+#: src/main.cc:186
 #, fuzzy, c-format
 #| msgid " autoclean    - Erase old downloaded package files\n"
 msgid " autoclean    - Erase old downloaded package files.\n"
 msgstr " autoclean    - Slett gamle nedlasta pakkefiler\n"
 
-#: src/main.cc:184
+#: src/main.cc:187
 #, fuzzy, c-format
 #| msgid " changelog    - View a package's changelog\n"
 msgid " changelog    - View a package's changelog.\n"
 msgstr " changelog    - Vis endringsloggen til ein pakke\n"
 
-#: src/main.cc:185
+#: src/main.cc:188
 #, 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     - Last ned .deb-fila for ein pakke\n"
 
-#: src/main.cc:186
+#: src/main.cc:189
 #, c-format
 msgid ""
 " reinstall    - Download and (possibly) reinstall a currently installed "
 "package.\n"
 msgstr ""
 
-#: src/main.cc:187
+#: src/main.cc:190
 #, fuzzy, c-format
 msgid ""
 " why          - Show the manually installed packages that require a package, "
@@ -5293,7 +5434,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:189
+#: src/main.cc:192
 #, fuzzy, c-format
 msgid ""
 " why-not      - Show the manually installed packages that lead to a "
@@ -5302,47 +5443,47 @@ 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:193
+#: src/main.cc:196
 #, c-format
 msgid "  Options:\n"
 msgstr "  Val:\n"
 
-#: src/main.cc:194
+#: src/main.cc:197
 #, fuzzy, c-format
 #| msgid " -h             This help text\n"
 msgid " -h             This help text.\n"
 msgstr " -h             Denne hjelpeteksten\n"
 
-#: src/main.cc:196
+#: src/main.cc:199
 #, c-format
 msgid ""
 " --gui          Use the GTK GUI even if disabled in the configuration.\n"
 msgstr ""
 
-#: src/main.cc:198
+#: src/main.cc:201
 #, c-format
 msgid " --no-gui       Do not use the GTK GUI even if available.\n"
 msgstr ""
 
-#: src/main.cc:199
+#: src/main.cc:202
 #, 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:200
+#: src/main.cc:203
 #, 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:201
+#: src/main.cc:204
 #, fuzzy, c-format
 #| msgid " -P             Always prompt for confirmation or actions\n"
 msgid " -P             Always prompt for confirmation or actions.\n"
 msgstr " -P             Spør alltid om stadfesting eller handlingar\n"
 
-#: src/main.cc:202
+#: src/main.cc:205
 #, fuzzy, c-format
 #| msgid ""
 #| " -y             Assume that the answer to simple yes/no questions is "
@@ -5351,7 +5492,7 @@ 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:203
+#: src/main.cc:206
 #, fuzzy, c-format
 #| msgid ""
 #| " -F format      Specify a format for displaying search results; see the "
@@ -5362,7 +5503,7 @@ msgid ""
 msgstr ""
 " -F format      Oppgje eit format for vising av søkjeresultat; sjå manualen\n"
 
-#: src/main.cc:204
+#: src/main.cc:207
 #, fuzzy, c-format
 #| msgid ""
 #| " -O order       Specify how search results should be sorted; see the "
@@ -5374,7 +5515,7 @@ msgstr ""
 " -O rekkjefølgje Oppgjev korleis eit søkjeresultat skal sorterast; sjå "
 "manualen\n"
 
-#: src/main.cc:205
+#: src/main.cc:208
 #, fuzzy, c-format
 #| msgid ""
 #| " -w width       Specify the display width for formatting search results\n"
@@ -5383,29 +5524,29 @@ msgid ""
 msgstr ""
 " -w breidde     Oppgje visingsbreidde for formatering av søkjeresultat\n"
 
-#: src/main.cc:206
+#: src/main.cc:209
 #, c-format
 msgid " -f             Aggressively try to fix broken packages.\n"
 msgstr " -f             Prøv hardt å reparere øydelagde pakkar.\n"
 
-#: src/main.cc:207
+#: src/main.cc:210
 #, 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:208
+#: src/main.cc:211
 #, c-format
 msgid ""
 " -D             Show the dependencies of automatically changed packages.\n"
 msgstr " -D             Vis pakkekrava til automatisk endra pakkar.\n"
 
-#: src/main.cc:209
+#: src/main.cc:212
 #, 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:210
+#: src/main.cc:213
 #, fuzzy, c-format
 #| msgid ""
 #| " -v             Display extra information. (may be supplied multiple "
@@ -5416,7 +5557,7 @@ msgid ""
 msgstr ""
 " -v             Vis ekstra informasjon. (kan tilføyast fleire gongar)\n"
 
-#: src/main.cc:211
+#: src/main.cc:214
 #, fuzzy, c-format
 #| msgid ""
 #| " -t [release]   Set the release from which packages should be installed\n"
@@ -5425,20 +5566,20 @@ msgid ""
 msgstr ""
 " -t [sleppversjon]  Set sleppversjonen som pakkar skal installerast frå\n"
 
-#: src/main.cc:212
+#: src/main.cc:215
 #, c-format
 msgid ""
 " -q             In command-line mode, suppress the incremental progress.\n"
 "                indicators.\n"
 msgstr ""
 
-#: src/main.cc:214
+#: src/main.cc:217
 #, 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 nøkkel=verdi    Set direkte oppsettsvalet som heiter «nøkkel»\n"
 
-#: src/main.cc:215
+#: src/main.cc:218
 #, fuzzy, c-format
 #| msgid ""
 #| " --with(out)-recommends\tSpecify whether or not to treat recommends as\n"
@@ -5450,34 +5591,34 @@ msgstr ""
 " --with(out)-recommends\tOppgje om tilrådde og/eller føreslåtte pakkar skal\n"
 "                handterast som strenge pakkekrav\n"
 
-#: src/main.cc:217
+#: src/main.cc:220
 #, 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:218
+#: src/main.cc:221
 #, c-format
 msgid " -u             Download new package lists on startup.\n"
 msgstr " -u             Last ned ny pakkeliste ved oppstart.\n"
 
-#: src/main.cc:219 src/main.cc:221
+#: src/main.cc:222 src/main.cc:224
 #, c-format
 msgid "                  (terminal interface only)"
 msgstr ""
 
-#: src/main.cc:220
+#: src/main.cc:223
 #, c-format
 msgid " -i             Perform an install run on startup.\n"
 msgstr " -i             Utfør ei installasjonskøyring ved oppstart.\n"
 
-#: src/main.cc:223
+#: src/main.cc:226
 #, 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:345
+#: src/main.cc:352
 #, fuzzy
 #| msgid "replaces"
 msgid "trace"
@@ -5485,13 +5626,13 @@ 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:348
+#: src/main.cc:355
 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:351
+#: src/main.cc:358
 #, fuzzy
 #| msgid "no"
 msgid "info"
@@ -5499,13 +5640,13 @@ 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:354
+#: src/main.cc:361
 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:357
+#: src/main.cc:364
 #, fuzzy
 #| msgid "Err "
 msgid "error"
@@ -5513,83 +5654,102 @@ 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:360
+#: src/main.cc:367
 #, 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:363
+#: src/main.cc:370
 msgid "off"
 msgstr ""
 
 #. ForTranslators: both the translated and the untranslated
 #. log level names are accepted here.
-#: src/main.cc:433
+#: src/main.cc:440
 #, c-format
 msgid ""
 "Unknown log level name \"%s\" (expected \"trace\", \"debug\", \"info\", "
 "\"warn\", \"error\", \"fatal\", or \"off\")."
 msgstr ""
 
-#: src/main.cc:446
+#: src/main.cc:453
 #, fuzzy, c-format
 #| msgid "Invalid operation %s"
 msgid "Invalid logger name \"%s\"."
 msgstr "Ugyldig operasjon %s"
 
-#: src/main.cc:690
+#: src/main.cc:701
 #, fuzzy, c-format
 msgid "Expected a number after -q=\n"
 msgstr "Klarer ikkje opna %s"
 
-#: src/main.cc:699
+#: src/main.cc:710
 #, fuzzy, c-format
 msgid "Expected a number after -q=, got %s\n"
 msgstr "Klarer ikkje opna %s"
 
-#: src/main.cc:723
+#: src/main.cc:734
 #, 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:821
+#: src/main.cc:832
 #, c-format
 msgid "No comma following tag name \"%s\".\n"
 msgstr ""
 
-#: src/main.cc:891 src/main.cc:900
+#: src/main.cc:910 src/main.cc:919
 msgid "WEIRDNESS: unknown option code received\n"
 msgstr "MERKJELEG: mottok ein ukjent valkode\n"
 
-#: src/main.cc:906
+#: src/main.cc:937
+msgid "--show-package-names|never"
+msgstr ""
+
+#: src/main.cc:940
+msgid "--show-package-names|auto"
+msgstr ""
+
+#: src/main.cc:943
+msgid "--show-package-names|always"
+msgstr ""
+
+#: src/main.cc:948
+#, c-format
+msgid ""
+"Invalid package names display mode \"%s\" (should be \"never\", \"auto\", or "
+"\"always\")."
+msgstr ""
+
+#: src/main.cc:954
 msgid "no-summary"
 msgstr ""
 
-#: src/main.cc:908
+#: src/main.cc:956
 #, fuzzy
 #| msgid "Package"
 msgid "first-package"
 msgstr "Pakke"
 
-#: src/main.cc:910
+#: src/main.cc:958
 msgid "first-package-and-type"
 msgstr ""
 
-#: src/main.cc:912
+#: src/main.cc:960
 #, fuzzy
 #| msgid "All Packages"
 msgid "all-packages"
 msgstr "Alle pakkar"
 
-#: src/main.cc:914
+#: src/main.cc:962
 msgid "all-packages-with-dep-versions"
 msgstr ""
 
 #. ForTranslators: "why" here is the aptitude command name and
 #. should not be translated.
-#: src/main.cc:920
+#: src/main.cc:968
 #, c-format
 msgid ""
 "Invalid \"why\" summary mode \"%s\": expected \"no-summary\", \"first-package"
@@ -5597,7 +5757,7 @@ msgid ""
 "versions\"."
 msgstr ""
 
-#: src/main.cc:972
+#: src/main.cc:1020
 #, fuzzy
 #| msgid "Only one of -u and -i may be specified\n"
 msgid ""
@@ -5605,7 +5765,7 @@ msgid ""
 "specified\n"
 msgstr "Berre ein av -u og -i kan oppgjevast\n"
 
-#: src/main.cc:981
+#: src/main.cc:1029
 #, fuzzy
 #| msgid ""
 #| "-u and -i may not be specified in command-line mode (eg, with 'install')"
@@ -5614,23 +5774,23 @@ msgid ""
 "(eg, with 'install')"
 msgstr "-u og -i kan ikkje oppgjevast i kommandolinjemodus (dvs, med «install»)"
 
-#: src/main.cc:1002
+#: src/main.cc:1050
 #, 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 og -i kan ikkje oppgjevast med ein kommando"
 
-#: src/main.cc:1104
+#: src/main.cc:1161
 #, c-format
 msgid "Unknown command \"%s\"\n"
 msgstr "Ukjent kommando «%s»\n"
 
-#: src/main.cc:1116 src/main.cc:1184
+#: src/main.cc:1173 src/main.cc:1241
 #, c-format
 msgid "Uncaught exception: %s\n"
 msgstr ""
 
-#: src/main.cc:1120 src/main.cc:1188
+#: src/main.cc:1177 src/main.cc:1245
 #, c-format
 msgid ""
 "Backtrace:\n"
@@ -6723,12 +6883,6 @@ msgstr "%BNedgrader%b desse pakkane: %n"
 msgid "Leave the following dependencies unresolved:%n"
 msgstr "%BFjern%b desse pakkane: %n"
 
-#: src/solution_fragment.cc:505
-#, fuzzy, c-format
-#| msgid "DL Size: %sB"
-msgid "Tier: %s"
-msgstr "NL strl: %sB"
-
 #: src/solution_item.cc:97
 #, c-format
 msgid "Remove %F [%s (%s)]"
@@ -7718,22 +7872,59 @@ msgstr "Vis dei viktige endringane som er gjort i kvar versjon av "
 msgid "Preparing to download the changelog of %s"
 msgstr "Nettadresse som endringsloggar skal hentast frå"
 
-#: src/view_changelog.cc:359
+#: src/view_changelog.cc:371
 #, fuzzy, c-format
 #| msgid "URL to use to download changelogs"
 msgid "Failed to download the changelog of %s: %s"
 msgstr "Nettadresse som endringsloggar skal hentast frå"
 
-#: src/view_changelog.cc:370
+#: src/view_changelog.cc:382
 #, fuzzy, c-format
 #| msgid "Downloading Changelog"
 msgid "Downloading the changelog of %s"
 msgstr "Lastar ned endringslogg"
 
-#: src/view_changelog.cc:403
+#: src/view_changelog.cc:415
 msgid "You can only view changelogs of official Debian packages."
 msgstr "Du kan berre lesa endringsloggar for offisielle debianpakkar."
 
+#, fuzzy
+#~ msgid ""
+#~ "Unable to resolve dependencies for the upgrade (the resolver timed out)."
+#~ msgstr "Klarer ikkje løyse pakkekrava! Gjev opp ..."
+
+#, fuzzy
+#~| msgid "Section"
+#~ msgid "Safe actions"
+#~ msgstr "Seksjon"
+
+#, fuzzy
+#~ msgid "Cancel all user actions"
+#~ msgstr "Pakkar som krev %s"
+
+#, fuzzy
+#~| msgid "'-' to remove packages"
+#~ msgid "Remove packages"
+#~ msgstr "- for å fjerne pakkar"
+
+#, fuzzy
+#~| msgid "not a real package"
+#~ msgid "Modify held packages"
+#~ msgstr "ikkje ein verkeleg pakke"
+
+#, fuzzy
+#~ msgid "Remove essential packages"
+#~ msgstr "%BFjern%b desse pakkane: %n"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "Ukjend"
+
+#, fuzzy
+#~| msgid "DL Size: %sB"
+#~ msgid "Tier: %s"
+#~ msgstr "NL strl: %sB"
+
 #~ msgid "Downloading Changelog"
 #~ msgstr "Lastar ned endringslogg"
 
@@ -7918,11 +8109,6 @@ msgstr "Du kan berre lesa endringsloggar for offisielle debianpakkar."
 #~ msgid "%d packages to remove"
 #~ msgstr "Ingen pakkar er øydelagde."
 
-#, fuzzy
-#~| msgid "Packages"
-#~ msgid "Packages:"
-#~ msgstr "Pakkar"
-
 #~ msgid "Yes"
 #~ msgstr "Ja"