fix test/integration/test-apt-helper

[apt.git] / po / nn.po

diff --git a/po/nn.po b/po/nn.po
index d9de9765fe791012215b20827bbf6598a09ae00a..6409df3fc42b7d0e7c3bd48268a75d77d496164f 100644 (file)
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_nn\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt_nn\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2013-12-12 18:37+0100\n"
+"POT-Creation-Date: 2014-02-28 10:56+0100\n"

 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"


@@ -96,7 +96,7 @@ msgid "Total space accounted for: "
 msgstr "Brukt plass i alt: "
 
 #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
 msgstr "Brukt plass i alt: "
 
 #: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146

-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55

 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ute av takt."
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ute av takt."


@@ -104,7 +104,7 @@ msgstr "Pakkefila %s er ute av takt."
 #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
 #: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
 #: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
 #: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221

-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169

 msgid "No packages found"
 msgstr "Fann ingen pakkar"
 
 msgid "No packages found"
 msgstr "Fann ingen pakkar"
 


@@ -117,7 +117,7 @@ msgstr "Du m
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 

-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574
+#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586

 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Finn ikkje pakken %s"
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Finn ikkje pakken %s"


@@ -160,10 +160,11 @@ msgstr "  Pakke spikra til: "
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 

-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1579 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377
+#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:591 cmdline/apt-internal-solver.cc:34
+#: cmdline/apt-sortpkgs.cc:147

 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s %s kompilert på %s %s\n"
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s %s kompilert på %s %s\n"


@@ -261,12 +262,12 @@ msgstr ""
 " «%s»\n"
 "i stasjonen «%s» og trykk Enter.\n"
 
 " «%s»\n"
 "i stasjonen «%s» og trykk Enter.\n"
 

-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141

 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Klarte ikkje endra namnet på %s til %s"
 
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Klarte ikkje endra namnet på %s til %s"
 

-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196

 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 


@@ -357,23 +358,23 @@ msgstr "Intern feil. AllUpgrade 
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje låsa nedlastingskatalogen"
 
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje låsa nedlastingskatalogen"
 

-#: cmdline/apt-get.cc:722
+#: cmdline/apt-get.cc:725

 msgid "Must specify at least one package to fetch source for"
 msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for"
 
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for"
 

-#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Finn ingen kjeldepakke for %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Finn ingen kjeldepakke for %s"
 

-#: cmdline/apt-get.cc:779
+#: cmdline/apt-get.cc:782

 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:787

 #, c-format
 msgid ""
 "Please use:\n"
 #, c-format
 msgid ""
 "Please use:\n"


@@ -381,115 +382,115 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:840

 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
 
 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
 

-#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863
+#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866

 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 
 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 

-#: cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:877

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB

-#: cmdline/apt-get.cc:883
+#: cmdline/apt-get.cc:886

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB

-#: cmdline/apt-get.cc:888
+#: cmdline/apt-get.cc:891

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Må henta %sB med kjeldekodearkiv.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Må henta %sB med kjeldekodearkiv.\n"
 

-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:897

 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hent kjeldekode %s\n"
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hent kjeldekode %s\n"
 

-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:918

 msgid "Failed to fetch some archives."
 msgstr "Klarte ikkje henta nokre av arkiva."
 
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikkje henta nokre av arkiva."
 

-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325

 msgid "Download complete and in download only mode"
 msgstr "Nedlastinga er ferdig i nedlastingsmodus"
 
 msgid "Download complete and in download only mode"
 msgstr "Nedlastinga er ferdig i nedlastingsmodus"
 

-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:949

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
 

-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:961

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislukkast.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislukkast.\n"
 

-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:962

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:981
+#: cmdline/apt-get.cc:984

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen «%s» mislukkast.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen «%s» mislukkast.\n"
 

-#: cmdline/apt-get.cc:1001
+#: cmdline/apt-get.cc:1004

 msgid "Child process failed"
 msgstr "Barneprosessen mislukkast"
 
 msgid "Child process failed"
 msgstr "Barneprosessen mislukkast"
 

-#: cmdline/apt-get.cc:1020
+#: cmdline/apt-get.cc:1023

 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for"
 

-#: cmdline/apt-get.cc:1045
+#: cmdline/apt-get.cc:1048

 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 

-#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072
+#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarte ikkje henta byggjekrav for %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarte ikkje henta byggjekrav for %s"
 

-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 

-#: cmdline/apt-get.cc:1262
+#: cmdline/apt-get.cc:1265

 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 

-#: cmdline/apt-get.cc:1280
+#: cmdline/apt-get.cc:1283

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 

-#: cmdline/apt-get.cc:1303
+#: cmdline/apt-get.cc:1306

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
 

-#: cmdline/apt-get.cc:1342
+#: cmdline/apt-get.cc:1345

 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "


@@ -498,37 +499,37 @@ msgstr ""
 "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
 "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
 
 "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
 "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
 

-#: cmdline/apt-get.cc:1348
+#: cmdline/apt-get.cc:1351

 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 

-#: cmdline/apt-get.cc:1371
+#: cmdline/apt-get.cc:1374

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
 

-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1389

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
 

-#: cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1394

 msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 

-#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499

 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Koplar til %s (%s)"
 
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Koplar til %s (%s)"
 

-#: cmdline/apt-get.cc:1584
+#: cmdline/apt-get.cc:1585

 msgid "Supported modules:"
 msgstr "Støtta modular:"
 
 msgid "Supported modules:"
 msgstr "Støtta modular:"
 

-#: cmdline/apt-get.cc:1625
+#: cmdline/apt-get.cc:1626

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -614,6 +615,28 @@ msgstr ""
 "til apt-get(8), sources.list(5) og apt.conf(5).\n"
 "                       APT har superku-krefter.\n"
 
 "til apt-get(8), sources.list(5) og apt.conf(5).\n"
 "                       APT har superku-krefter.\n"
 

+#: cmdline/apt-helper.cc:39
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for"
+
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:67
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""
+

 #: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 #: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"


@@ -640,8 +663,8 @@ msgid "%s was already not hold.\n"
 msgstr "Den nyaste versjonen av %s er installert frå før.\n"
 
 #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
 msgstr "Den nyaste versjonen av %s er installert frå før.\n"
 
 #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328

-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
+#: apt-pkg/deb/dpkgpm.cc:1182

 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Venta på %s, men den fanst ikkje"
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Venta på %s, men den fanst ikkje"


@@ -670,6 +693,11 @@ msgid ""
 "Commands:\n"
 "   auto - Mark the given packages as automatically installed\n"
 "   manual - Mark the given packages as manually installed\n"
 "Commands:\n"
 "   auto - Mark the given packages as automatically installed\n"
 "   manual - Mark the given packages as manually installed\n"

+"   hold - Mark a package as held back\n"
+"   unhold - Unset a package set as held back\n"
+"   showauto - Print the list of automatically installed packages\n"
+"   showmanual - Print the list of manually installed packages\n"
+"   showhold - Print the list of package on hold\n"

 "\n"
 "Options:\n"
 "  -h  This help text.\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"


@@ -687,14 +715,19 @@ msgid ""
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"
 "Usage: apt [options] command\n"
 "\n"
 "CLI for apt.\n"

-"Commands: \n"
+"Basic commands: \n"

 " list - list packages based on package names\n"
 " search - search in package descriptions\n"
 " show - show package details\n"
 "\n"
 " update - update list of available packages\n"
 " list - list packages based on package names\n"
 " search - search in package descriptions\n"
 " show - show package details\n"
 "\n"
 " update - update list of available packages\n"

+"\n"

 " install - install packages\n"
 " install - install packages\n"

-" upgrade - upgrade the systems packages\n"
+" remove  - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+" full-upgrade - upgrade the system by removing/installing/upgrading "
+"packages\n"

 "\n"
 " edit-sources - edit the source information file\n"
 msgstr ""
 "\n"
 " edit-sources - edit the source information file\n"
 msgstr ""


@@ -727,16 +760,16 @@ msgstr ""
 msgid "Disk not found."
 msgstr "Fann ikkje fila"
 
 msgid "Disk not found."
 msgstr "Fann ikkje fila"
 

-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274

 msgid "File not found"
 msgstr "Fann ikkje fila"
 
 msgid "File not found"
 msgstr "Fann ikkje fila"
 

-#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609

 msgid "Failed to stat"
 msgstr "Klarte ikkje få status"
 
 msgid "Failed to stat"
 msgstr "Klarte ikkje få status"
 

-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606

 msgid "Failed to set modification time"
 msgstr "Klarte ikkje setja endringstidspunkt"
 
 msgid "Failed to set modification time"
 msgstr "Klarte ikkje setja endringstidspunkt"
 


@@ -745,34 +778,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ugyldig URI. Lokale URI-ar kan ikkje starta med //"
 
 #. Login must be before getpeername otherwise dante won't work.
 msgstr "Ugyldig URI. Lokale URI-ar kan ikkje starta med //"
 
 #. Login must be before getpeername otherwise dante won't work.

-#: methods/ftp.cc:173
+#: methods/ftp.cc:172

 msgid "Logging in"
 msgstr "Loggar inn"
 
 msgid "Logging in"
 msgstr "Loggar inn"
 

-#: methods/ftp.cc:179
+#: methods/ftp.cc:178

 msgid "Unable to determine the peer name"
 msgstr "Klarte ikkje avgjera namnet på motparten"
 
 msgid "Unable to determine the peer name"
 msgstr "Klarte ikkje avgjera namnet på motparten"
 

-#: methods/ftp.cc:184
+#: methods/ftp.cc:183

 msgid "Unable to determine the local name"
 msgstr "Klarte ikkje avgjera det lokale namnet"
 
 msgid "Unable to determine the local name"
 msgstr "Klarte ikkje avgjera det lokale namnet"
 

-#: methods/ftp.cc:215 methods/ftp.cc:243
+#: methods/ftp.cc:214 methods/ftp.cc:242

 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Tenaren nekta oss å kopla til, og sa: %s"
 
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Tenaren nekta oss å kopla til, og sa: %s"
 

-#: methods/ftp.cc:221
+#: methods/ftp.cc:220

 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER mislukkast, tenaren sa: %s"
 
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER mislukkast, tenaren sa: %s"
 

-#: methods/ftp.cc:228
+#: methods/ftp.cc:227

 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS mislukkast, tenaren sa: %s"
 
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS mislukkast, tenaren sa: %s"
 

-#: methods/ftp.cc:248
+#: methods/ftp.cc:247

 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."


@@ -780,121 +813,121 @@ msgstr ""
 "Ein mellomtenar er oppgitt, men ikkje noko innloggingsskript. Feltet "
 "«Acquire::ftp::ProxyLogin» er tomt."
 
 "Ein mellomtenar er oppgitt, men ikkje noko innloggingsskript. Feltet "
 "«Acquire::ftp::ProxyLogin» er tomt."
 

-#: methods/ftp.cc:276
+#: methods/ftp.cc:275

 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Kommandoen «%s» i innlogginsskriptet mislukkast, tenaren sa: %s"
 
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Kommandoen «%s» i innlogginsskriptet mislukkast, tenaren sa: %s"
 

-#: methods/ftp.cc:302
+#: methods/ftp.cc:301

 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislukkast, tenaren sa: %s"
 
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislukkast, tenaren sa: %s"
 

-#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237
+#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236

 msgid "Connection timeout"
 msgstr "Tidsavbrot på samband"
 
 msgid "Connection timeout"
 msgstr "Tidsavbrot på samband"
 

-#: methods/ftp.cc:346
+#: methods/ftp.cc:345

 msgid "Server closed the connection"
 msgstr "Tenaren lukka sambandet"
 
 msgid "Server closed the connection"
 msgstr "Tenaren lukka sambandet"
 

-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292
+#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292

 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
 msgid "Read error"
 msgstr "Lesefeil"
 
 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
 msgid "Read error"
 msgstr "Lesefeil"
 

-#: methods/ftp.cc:356 methods/rsh.cc:206
+#: methods/ftp.cc:355 methods/rsh.cc:205

 msgid "A response overflowed the buffer."
 msgstr "Eit svar flaumde over bufferen."
 
 msgid "A response overflowed the buffer."
 msgstr "Eit svar flaumde over bufferen."
 

-#: methods/ftp.cc:373 methods/ftp.cc:385
+#: methods/ftp.cc:372 methods/ftp.cc:384

 msgid "Protocol corruption"
 msgstr "Protokolløydeleggjing"
 
 msgid "Protocol corruption"
 msgstr "Protokolløydeleggjing"
 

-#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388
+#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
+#: apt-pkg/contrib/fileutl.cc:1425

 msgid "Write error"
 msgstr "Skrivefeil"
 
 msgid "Write error"
 msgstr "Skrivefeil"
 

-#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737

 msgid "Could not create a socket"
 msgstr "Klarte ikkje oppretta sokkel"
 
 msgid "Could not create a socket"
 msgstr "Klarte ikkje oppretta sokkel"
 

-#: methods/ftp.cc:708
+#: methods/ftp.cc:707

 msgid "Could not connect data socket, connection timed out"
 msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot på sambandet"
 
 msgid "Could not connect data socket, connection timed out"
 msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot på sambandet"
 

-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22

 msgid "Failed"
 msgstr "Mislukkast"
 
 msgid "Failed"
 msgstr "Mislukkast"
 

-#: methods/ftp.cc:714
+#: methods/ftp.cc:713

 msgid "Could not connect passive socket."
 msgstr "Klarte ikkje kopla til passiv sokkel."
 
 msgid "Could not connect passive socket."
 msgstr "Klarte ikkje kopla til passiv sokkel."
 

-#: methods/ftp.cc:731
+#: methods/ftp.cc:730

 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo klarte ikkje oppretta ein lyttesokkel"
 
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo klarte ikkje oppretta ein lyttesokkel"
 

-#: methods/ftp.cc:745
+#: methods/ftp.cc:744

 msgid "Could not bind a socket"
 msgstr "Klarte ikkje binda til sokkel"
 
 msgid "Could not bind a socket"
 msgstr "Klarte ikkje binda til sokkel"
 

-#: methods/ftp.cc:749
+#: methods/ftp.cc:748

 msgid "Could not listen on the socket"
 msgstr "Klarte ikkje lytta til sokkel"
 
 msgid "Could not listen on the socket"
 msgstr "Klarte ikkje lytta til sokkel"
 

-#: methods/ftp.cc:756
+#: methods/ftp.cc:755

 msgid "Could not determine the socket's name"
 msgstr "Klarte ikkje avgjera sokkelnamnet"
 
 msgid "Could not determine the socket's name"
 msgstr "Klarte ikkje avgjera sokkelnamnet"
 

-#: methods/ftp.cc:788
+#: methods/ftp.cc:787

 msgid "Unable to send PORT command"
 msgstr "Klarte ikkje senda PORT-kommandoen"
 
 msgid "Unable to send PORT command"
 msgstr "Klarte ikkje senda PORT-kommandoen"
 

-#: methods/ftp.cc:798
+#: methods/ftp.cc:797

 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukjend adressefamilie %u (AF_*)"
 
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukjend adressefamilie %u (AF_*)"
 

-#: methods/ftp.cc:807
+#: methods/ftp.cc:806

 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislukkast, tenaren sa: %s"
 
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislukkast, tenaren sa: %s"
 

-#: methods/ftp.cc:827
+#: methods/ftp.cc:826

 msgid "Data socket connect timed out"
 msgstr "Tidsavbrot på tilkopling til datasokkel"
 
 msgid "Data socket connect timed out"
 msgstr "Tidsavbrot på tilkopling til datasokkel"
 

-#: methods/ftp.cc:834
+#: methods/ftp.cc:833

 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 

-#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313
+#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312

 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 

-#: methods/ftp.cc:886
+#: methods/ftp.cc:885

 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Klarte ikkje henta fila, tenaren sa «%s»"
 
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Klarte ikkje henta fila, tenaren sa «%s»"
 

-#: methods/ftp.cc:901 methods/rsh.cc:332
+#: methods/ftp.cc:900 methods/rsh.cc:331

 msgid "Data socket timed out"
 msgstr "Tidsavbrot på datasokkelen"
 
 msgid "Data socket timed out"
 msgstr "Tidsavbrot på datasokkelen"
 

-#: methods/ftp.cc:931
+#: methods/ftp.cc:930

 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverføringa mislukkast, tenaren sa «%s»"
 
 #. Get the files information
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverføringa mislukkast, tenaren sa «%s»"
 
 #. Get the files information

-#: methods/ftp.cc:1008
+#: methods/ftp.cc:1009

 msgid "Query"
 msgstr "Spørjing"
 
 msgid "Query"
 msgstr "Spørjing"
 

-#: methods/ftp.cc:1120
+#: methods/ftp.cc:1123

 msgid "Unable to invoke "
 msgstr "Klarte ikkje starta "
 
 msgid "Unable to invoke "
 msgstr "Klarte ikkje starta "
 


@@ -960,37 +993,37 @@ msgstr "Det hende noko dumt ved oppslag av 
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikkje kopla til %s %s:"
 
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikkje kopla til %s %s:"
 

-#: methods/gpgv.cc:167
+#: methods/gpgv.cc:166

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 

-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:170

 msgid "At least one invalid signature was encountered."
 msgstr ""
 
 msgid "At least one invalid signature was encountered."
 msgstr ""
 

-#: methods/gpgv.cc:173
+#: methods/gpgv.cc:172

 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'

-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:178

 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 

-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:182

 msgid "Unknown error executing gpgv"
 msgstr ""
 
 msgid "Unknown error executing gpgv"
 msgstr ""
 

-#: methods/gpgv.cc:216 methods/gpgv.cc:223
+#: methods/gpgv.cc:215 methods/gpgv.cc:222

 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
 
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
 

-#: methods/gpgv.cc:230
+#: methods/gpgv.cc:229

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1000,31 +1033,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
 msgid "Empty files can't be valid archives"
 msgstr ""
 

-#: methods/http.cc:519
+#: methods/http.cc:516

 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 

-#: methods/http.cc:533
+#: methods/http.cc:530

 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden"
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden"
 

-#: methods/http.cc:535
+#: methods/http.cc:532

 msgid "Error reading from server"
 msgstr "Feil ved lesing frå tenaren"
 
 msgid "Error reading from server"
 msgstr "Feil ved lesing frå tenaren"
 

-#: methods/http.cc:571
+#: methods/http.cc:568

 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 

-#: methods/http.cc:631
+#: methods/http.cc:628

 msgid "Select failed"
 msgstr "Utvalet mislukkast"
 
 msgid "Select failed"
 msgstr "Utvalet mislukkast"
 

-#: methods/http.cc:636
+#: methods/http.cc:633

 msgid "Connection timed out"
 msgstr "Tidsavbrot på sambandet"
 
 msgid "Connection timed out"
 msgstr "Tidsavbrot på sambandet"
 

-#: methods/http.cc:659
+#: methods/http.cc:656

 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 


@@ -1056,19 +1089,19 @@ msgstr "Denne HTTP-tenaren har 
 msgid "Unknown date format"
 msgstr "Ukjend datoformat"
 
 msgid "Unknown date format"
 msgstr "Ukjend datoformat"
 

-#: methods/server.cc:490
+#: methods/server.cc:494

 msgid "Bad header data"
 msgstr "Øydelagde hovuddata"
 
 msgid "Bad header data"
 msgstr "Øydelagde hovuddata"
 

-#: methods/server.cc:507 methods/server.cc:564
+#: methods/server.cc:511 methods/server.cc:567

 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 

-#: methods/server.cc:656
+#: methods/server.cc:659

 msgid "Internal error"
 msgstr "Intern feil"
 
 msgid "Internal error"
 msgstr "Intern feil"
 

-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147

 msgid "Listing"
 msgstr ""
 
 msgid "Listing"
 msgstr ""
 


@@ -1086,7 +1119,7 @@ msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil ved tilleggjing av avleiing"
 
 #: apt-private/private-install.cc:159
 msgstr "Intern feil ved tilleggjing av avleiing"
 
 #: apt-private/private-install.cc:159

-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"

 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included


@@ -1309,101 +1342,108 @@ msgstr "Installer desse pakkane utan verifikasjon?"
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikkje henta %s  %s\n"
 
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikkje henta %s  %s\n"
 

-#: apt-private/private-output.cc:198
-msgid "installed,upgradable to: "
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
+#: apt-private/private-show.cc:86
+msgid "unknown"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:201
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:205

 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Installert]"
 
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Installert]"
 

-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:208

 msgid "[installed,auto-removable]"
 msgstr ""
 
 msgid "[installed,auto-removable]"
 msgstr ""
 

-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:210

 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Installert]"
 
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Installert]"
 

-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:212

 #, fuzzy
 msgid "[installed]"
 msgstr " [Installert]"
 
 #, fuzzy
 msgid "[installed]"
 msgstr " [Installert]"
 

-#: apt-private/private-output.cc:217
-msgid "[upgradable from: "
+#: apt-private/private-output.cc:216
+#, c-format
+msgid "[upgradable from: %s]"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:220

 msgid "[residual-config]"
 msgstr ""
 
 msgid "[residual-config]"
 msgstr ""
 

-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:320

 msgid "The following packages have unmet dependencies:"
 msgstr "Følgjande pakkar har krav som ikkje er oppfylte:"
 
 msgid "The following packages have unmet dependencies:"
 msgstr "Følgjande pakkar har krav som ikkje er oppfylte:"
 

-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:410

 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installert"
 
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installert"
 

-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:412

 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s skal installerast"
 
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s skal installerast"
 

-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:419

 msgid "but it is not installable"
 msgstr "men lèt seg ikkje installera"
 
 msgid "but it is not installable"
 msgstr "men lèt seg ikkje installera"
 

-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:421

 msgid "but it is a virtual package"
 msgstr "men er ein virtuell pakke"
 
 msgid "but it is a virtual package"
 msgstr "men er ein virtuell pakke"
 

-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:424

 msgid "but it is not installed"
 msgstr "men er ikkje installert"
 
 msgid "but it is not installed"
 msgstr "men er ikkje installert"
 

-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:424

 msgid "but it is not going to be installed"
 msgstr "men skal ikkje installerast"
 
 msgid "but it is not going to be installed"
 msgstr "men skal ikkje installerast"
 

-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:429

 msgid " or"
 msgstr " eller"
 
 msgid " or"
 msgstr " eller"
 

-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:458

 msgid "The following NEW packages will be installed:"
 msgstr "Dei følgjande NYE pakkane vil verta installerte:"
 
 msgid "The following NEW packages will be installed:"
 msgstr "Dei følgjande NYE pakkane vil verta installerte:"
 

-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:484

 msgid "The following packages will be REMOVED:"
 msgstr "Dei følgjande pakkane vil verta FJERNA:"
 
 msgid "The following packages will be REMOVED:"
 msgstr "Dei følgjande pakkane vil verta FJERNA:"
 

-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:506

 msgid "The following packages have been kept back:"
 msgstr "Dei følgjande pakkane er haldne tilbake:"
 
 msgid "The following packages have been kept back:"
 msgstr "Dei følgjande pakkane er haldne tilbake:"
 

-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:527

 msgid "The following packages will be upgraded:"
 msgstr "Dei følgjande pakkane vil verta oppgraderte:"
 
 msgid "The following packages will be upgraded:"
 msgstr "Dei følgjande pakkane vil verta oppgraderte:"
 

-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:548

 msgid "The following packages will be DOWNGRADED:"
 msgstr "Dei følgjande pakkane vil verta NEDGRADERTE:"
 
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Dei følgjande pakkane vil verta NEDGRADERTE:"
 

-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:568

 msgid "The following held packages will be changed:"
 msgstr "Dei følgjande pakkane som er haldne tilbake vil verta endra:"
 
 msgid "The following held packages will be changed:"
 msgstr "Dei følgjande pakkane som er haldne tilbake vil verta endra:"
 

-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:623

 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (fordi %s) "
 
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (fordi %s) "
 

-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:631

 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"


@@ -1412,27 +1452,27 @@ msgstr ""
 "ÅTVARING: Dei følgjande nødvendige pakkane vil verta fjerna.\n"
 "Dette bør IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
 
 "ÅTVARING: Dei følgjande nødvendige pakkane vil verta fjerna.\n"
 "Dette bør IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
 

-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:662

 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu oppgraderte, %lu nyleg installerte, "
 
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu oppgraderte, %lu nyleg installerte, "
 

-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:666

 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installerte på nytt, "
 
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installerte på nytt, "
 

-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:668

 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 

-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:670

 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
 
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
 

-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:674

 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"


@@ -1441,7 +1481,7 @@ msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
 #. e.g. "Do you want to continue? [Y/n] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
 #. e.g. "Do you want to continue? [Y/n] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.

-#: apt-private/private-output.cc:690
+#: apt-private/private-output.cc:696

 msgid "[Y/n]"
 msgstr "[J/n]"
 
 msgid "[Y/n]"
 msgstr "[J/n]"
 


@@ -1449,21 +1489,21 @@ msgstr "[J/n]"
 #. e.g. "Should this file be removed? [y/N] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.
 #. e.g. "Should this file be removed? [y/N] "
 #. The user has to answer with an input matching the
 #. YESEXPR/NOEXPR defined in your l10n.

-#: apt-private/private-output.cc:696
+#: apt-private/private-output.cc:702

 msgid "[y/N]"
 msgstr "[j/N]"
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
 msgid "[y/N]"
 msgstr "[j/N]"
 
 #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set

-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:713

 msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
 msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set

-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:719

 msgid "N"
 msgstr "N"
 
 msgid "N"
 msgstr "N"
 

-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-kompileringsfeil - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-kompileringsfeil - %s"


@@ -1505,16 +1545,16 @@ msgstr ""
 msgid "The update command takes no arguments"
 msgstr "Oppdateringskommandoen tek ingen argument"
 
 msgid "The update command takes no arguments"
 msgstr "Oppdateringskommandoen tek ingen argument"
 

-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19

 msgid "Calculating upgrade... "
 msgstr "Reknar ut oppgradering ... "
 
 msgid "Calculating upgrade... "
 msgstr "Reknar ut oppgradering ... "
 

-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24

 #, fuzzy
 msgid "Internal error, Upgrade broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
 #, fuzzy
 msgid "Internal error, Upgrade broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 

-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26

 msgid "Done"
 msgstr "Ferdig"
 
 msgid "Done"
 msgstr "Ferdig"
 


@@ -1522,7 +1562,15 @@ msgstr "Ferdig"
 msgid "Full Text Search"
 msgstr ""
 
 msgid "Full Text Search"
 msgstr ""
 

-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159

 msgid "not a real package (virtual)"
 msgstr ""
 
 msgid "not a real package (virtual)"
 msgstr ""
 


@@ -1534,43 +1582,43 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 

-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45

 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Klarte ikkje endra namnet på %s til %s"
 
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Klarte ikkje endra namnet på %s til %s"
 

-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57

 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
 #, c-format
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 

-#: apt-private/acqprogress.cc:60
+#: apt-private/acqprogress.cc:63

 msgid "Hit "
 msgstr "Treff "
 
 msgid "Hit "
 msgstr "Treff "
 

-#: apt-private/acqprogress.cc:84
+#: apt-private/acqprogress.cc:87

 msgid "Get:"
 msgstr "Hent:"
 
 msgid "Get:"
 msgstr "Hent:"
 

-#: apt-private/acqprogress.cc:115
+#: apt-private/acqprogress.cc:118

 msgid "Ign "
 msgstr "Ign "
 
 msgid "Ign "
 msgstr "Ign "
 

-#: apt-private/acqprogress.cc:119
+#: apt-private/acqprogress.cc:122

 msgid "Err "
 msgstr "Feil "
 
 msgid "Err "
 msgstr "Feil "
 

-#: apt-private/acqprogress.cc:140
+#: apt-private/acqprogress.cc:143

 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Henta %sB på %s (%sB/s)\n"
 
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Henta %sB på %s (%sB/s)\n"
 

-#: apt-private/acqprogress.cc:230
+#: apt-private/acqprogress.cc:233

 #, c-format
 msgid " [Working]"
 msgstr " [Arbeider]"
 
 #, c-format
 msgid " [Working]"
 msgstr " [Arbeider]"
 

-#: apt-private/acqprogress.cc:291
+#: apt-private/acqprogress.cc:294

 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"


@@ -1585,8 +1633,8 @@ msgstr ""
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:464
 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:464
 #: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406

-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
+#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100

 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
 #, c-format
 msgid "Unable to read %s"
 #: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
 #, c-format
 msgid "Unable to read %s"


@@ -1624,25 +1672,11 @@ msgstr "Klarte ikkje opna fila %s"
 msgid "[Mirror: %s]"
 msgstr ""
 
 msgid "[Mirror: %s]"
 msgstr ""
 

-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169

 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Klarte ikkje oppretta IPC-røyr til underprosessen"
 
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Klarte ikkje oppretta IPC-røyr til underprosessen"
 

-#: methods/rsh.cc:340
+#: methods/rsh.cc:339

 msgid "Connection closed prematurely"
 msgstr "Sambandet vart uventa stengd"
 
 msgid "Connection closed prematurely"
 msgstr "Sambandet vart uventa stengd"
 


@@ -1682,12 +1716,7 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller p
 msgid "Merging available information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 
 msgid "Merging available information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 

-#: cmdline/apt-extracttemplates.cc:102
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s er ingen gyldig DEB-pakke."
-
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:224

 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"


@@ -1711,12 +1740,12 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
 
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
 

-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388

 #, c-format
 msgid "Unable to write to %s"
 msgstr "Klarte ikkje skriva til %s"
 
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Klarte ikkje skriva til %s"
 

-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:298

 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Finn ikkje debconf-versjonen. Er debconf installert?"
 
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Finn ikkje debconf-versjonen. Er debconf installert?"
 


@@ -1957,72 +1986,79 @@ msgstr "  %s har inga overstyringsoppf
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Klarte ikkje tildela minne"
 
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Klarte ikkje tildela minne"
 

-#: ftparchive/override.cc:35 ftparchive/override.cc:143
+#: ftparchive/override.cc:35 ftparchive/override.cc:139

 #, c-format
 msgid "Unable to open %s"
 msgstr "Klarte ikkje opna %s"
 
 #, c-format
 msgid "Unable to open %s"
 msgstr "Klarte ikkje opna %s"
 

-#: ftparchive/override.cc:61 ftparchive/override.cc:167
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:65
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Misforma overstyring %s linje %lu #1"
+
+#: ftparchive/override.cc:124 ftparchive/override.cc:198
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Klarte ikkje lesa overstyringsfila %s"
+
+#: ftparchive/override.cc:163

 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
 msgstr "Misforma overstyring %s linje %lu #1"
 
 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
 msgstr "Misforma overstyring %s linje %lu #1"
 

-#: ftparchive/override.cc:75 ftparchive/override.cc:179
+#: ftparchive/override.cc:175

 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
 msgstr "Misforma overstyring %s linje %lu #2"
 
 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
 msgstr "Misforma overstyring %s linje %lu #2"
 

-#: ftparchive/override.cc:89 ftparchive/override.cc:192
+#: ftparchive/override.cc:188

 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
 msgstr "Misforma overstyring %s linje %lu #3"
 
 #, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
 msgstr "Misforma overstyring %s linje %lu #3"
 

-#: ftparchive/override.cc:128 ftparchive/override.cc:202
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Klarte ikkje lesa overstyringsfila %s"
-
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71

 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Ukjend komprimeringsalgoritme %s"
 
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Ukjend komprimeringsalgoritme %s"
 

-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101

 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Komprimert utdata %s treng eit komprimeringssett"
 
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Komprimert utdata %s treng eit komprimeringssett"
 

-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190

 msgid "Failed to create FILE*"
 msgstr "Klarte ikkje oppretta FILE*"
 
 msgid "Failed to create FILE*"
 msgstr "Klarte ikkje oppretta FILE*"
 

-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193

 msgid "Failed to fork"
 msgstr "Klarte ikkje gafla"
 
 msgid "Failed to fork"
 msgstr "Klarte ikkje gafla"
 

-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207

 msgid "Compress child"
 msgstr "Komprimer barn"
 
 msgid "Compress child"
 msgstr "Komprimer barn"
 

-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230

 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Intern feil, klarte ikkje oppretta %s"
 
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Intern feil, klarte ikkje oppretta %s"
 

-#: ftparchive/multicompress.cc:304
+#: ftparchive/multicompress.cc:303

 msgid "IO to subprocess/file failed"
 msgstr "Klarte ikkje kommunisera med underprosess/fil"
 
 msgid "IO to subprocess/file failed"
 msgstr "Klarte ikkje kommunisera med underprosess/fil"
 

-#: ftparchive/multicompress.cc:342
+#: ftparchive/multicompress.cc:341

 msgid "Failed to read while computing MD5"
 msgstr "Klarte ikkje lesa under utrekning av MD5"
 
 msgid "Failed to read while computing MD5"
 msgstr "Klarte ikkje lesa under utrekning av MD5"
 

-#: ftparchive/multicompress.cc:358
+#: ftparchive/multicompress.cc:357

 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problem ved oppheving av lenkje til %s"
 
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problem ved oppheving av lenkje til %s"
 

-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187

 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Klarte ikkje endra namnet på %s til %s"
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Klarte ikkje endra namnet på %s til %s"


@@ -2080,23 +2116,23 @@ msgstr ""
 "  -c=? Les denne oppsettsfila.\n"
 "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
 
 "  -c=? Les denne oppsettsfila.\n"
 "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
 

-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:122

 msgid "Failed to create pipes"
 msgstr "Klarte ikkje oppretta røyr"
 
 msgid "Failed to create pipes"
 msgstr "Klarte ikkje oppretta røyr"
 

-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:149

 msgid "Failed to exec gzip "
 msgstr "Klarte ikkje køyra gzip "
 
 msgid "Failed to exec gzip "
 msgstr "Klarte ikkje køyra gzip "
 

-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
+#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216

 msgid "Corrupted archive"
 msgstr "Øydelagt arkiv"
 
 msgid "Corrupted archive"
 msgstr "Øydelagt arkiv"
 

-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:201

 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-sjekksummen mislukkast, arkivet er øydelagt"
 
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-sjekksummen mislukkast, arkivet er øydelagt"
 

-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:306

 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukjend TAR-hovud type %u, medlem %s"
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukjend TAR-hovud type %u, medlem %s"


@@ -2162,7 +2198,7 @@ msgstr "Dobbel oppsettsfil %s/%s"
 msgid "Failed to write file %s"
 msgstr "Klarte ikkje skriva fila %s"
 
 msgid "Failed to write file %s"
 msgstr "Klarte ikkje skriva fila %s"
 

-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#: apt-inst/dirstream.cc:106

 #, c-format
 msgid "Failed to close file %s"
 msgstr "Klarte ikkje lukka fila %s"
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Klarte ikkje lukka fila %s"


@@ -2219,18 +2255,18 @@ msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
 msgid "Unable to stat %s"
 msgstr "Klarte ikkje få status til %s"
 
 msgid "Unable to stat %s"
 msgstr "Klarte ikkje få status til %s"
 

-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
-#: apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:57

 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar «%s»-medlemmen"
 
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar «%s»-medlemmen"
 

-#: apt-inst/deb/debfile.cc:119
+#: apt-inst/deb/debfile.cc:124

 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Intern feil, fann ikkje medlemmen %s"
 
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Intern feil, fann ikkje medlemmen %s"
 

-#: apt-inst/deb/debfile.cc:213
+#: apt-inst/deb/debfile.cc:219

 msgid "Unparsable control file"
 msgstr "Kontrollfila kan ikkje tolkast"
 
 msgid "Unparsable control file"
 msgstr "Kontrollfila kan ikkje tolkast"
 


@@ -2275,14 +2311,14 @@ msgid ""
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:440
+#: apt-pkg/contrib/mmap.cc:446

 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:443
+#: apt-pkg/contrib/mmap.cc:449

 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""


@@ -2502,12 +2538,12 @@ msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 

-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237

 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s returnerte ein feilkode (%u)"
 
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s returnerte ein feilkode (%u)"
 

-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230

 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avslutta uventa"
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avslutta uventa"


@@ -2540,27 +2576,27 @@ msgstr "lese, har framleis %lu att 
 msgid "write, still have %llu to write but couldn't"
 msgstr "skrive, har framleis %lu att å skrive, men klarte ikkje"
 
 msgid "write, still have %llu to write but couldn't"
 msgstr "skrive, har framleis %lu att å skrive, men klarte ikkje"
 

-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1723

 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem ved låsing av fila"
 
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem ved låsing av fila"
 

-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1735

 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem ved synkronisering av fila"
 
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem ved synkronisering av fila"
 

-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1746

 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem ved oppheving av lenkje til fila"
 
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem ved oppheving av lenkje til fila"
 

-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1759

 msgid "Problem syncing the file"
 msgstr "Problem ved synkronisering av fila"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 msgid "Problem syncing the file"
 msgstr "Problem ved synkronisering av fila"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory

-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70

 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Avbryt installasjon."
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Avbryt installasjon."


@@ -2679,81 +2715,91 @@ msgstr "Klarte ikkje skriva fila %s"
 msgid "Unable to parse package file %s (1)"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
 msgid "Unable to parse package file %s (1)"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 

-#: apt-pkg/tagfile.cc:231
+#: apt-pkg/tagfile.cc:235

 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarte ikkje tolka pakkefila %s (2)"
 
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarte ikkje tolka pakkefila %s (2)"
 

-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:118
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
+
+#: apt-pkg/sourcelist.cc:161

 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 

-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:164

 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist)"
 
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist)"
 

-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:175

 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 

-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:181

 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 

-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:184

 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 

-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:197

 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Misforma linje %lu i kjeldelista %s (URI)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Misforma linje %lu i kjeldelista %s (URI)"
 

-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:199

 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist)"
 

-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:202

 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
 

-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:208

 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)"
 

-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:215

 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 

-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:326

 #, c-format
 msgid "Opening %s"
 msgstr "Opnar %s"
 
 #, c-format
 msgid "Opening %s"
 msgstr "Opnar %s"
 

-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495

 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Linja %u i kjeldelista %s er for lang."
 
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Linja %u i kjeldelista %s er for lang."
 

-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:362

 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Misforma linje %u i kjeldelista %s (type)"
 
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Misforma linje %u i kjeldelista %s (type)"
 

-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:366

 #, fuzzy, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s"
 
 #, fuzzy, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s"
 

+#: apt-pkg/sourcelist.cc:407
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s"
+

 #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
 #, c-format
 msgid ""
 #: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
 #, c-format
 msgid ""


@@ -2802,7 +2848,7 @@ msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Klarte ikkje retta opp problema. Nokre øydelagde pakkar er haldne tilbake."
 
 msgstr ""
 "Klarte ikkje retta opp problema. Nokre øydelagde pakkar er haldne tilbake."
 

-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811

 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Listekatalogen %spartial manglar."
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Listekatalogen %spartial manglar."


@@ -2829,17 +2875,22 @@ msgstr ""
 msgid "Retrieving file %li of %li"
 msgstr "Les filliste"
 
 msgid "Retrieving file %li of %li"
 msgstr "Les filliste"
 

-#: apt-pkg/acquire-worker.cc:112
+#: apt-pkg/acquire-worker.cc:113

 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Finn ikkje metodedrivaren %s."
 
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Finn ikkje metodedrivaren %s."
 

-#: apt-pkg/acquire-worker.cc:161
+#: apt-pkg/acquire-worker.cc:115
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:166

 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s starta ikkje rett"
 
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Metoden %s starta ikkje rett"
 

-#: apt-pkg/acquire-worker.cc:447
+#: apt-pkg/acquire-worker.cc:452

 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2885,17 +2936,17 @@ msgid ""
 "available in the sources"
 msgstr ""
 
 "available in the sources"
 msgstr ""
 

-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414

 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
 
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
 

-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436

 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Skjønar ikkje spikringstypen %s"
 
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Skjønar ikkje spikringstypen %s"
 

-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444

 msgid "No priority (or zero) specified for pin"
 msgstr "Ingen prioritet (eller null) oppgitt for spiker"
 
 msgid "No priority (or zero) specified for pin"
 msgstr "Ingen prioritet (eller null) oppgitt for spiker"
 


@@ -2977,35 +3028,35 @@ msgstr "Feil storleik"
 msgid "Invalid file format"
 msgstr "Ugyldig operasjon %s"
 
 msgid "Invalid file format"
 msgstr "Ugyldig operasjon %s"
 

-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1570

 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1586

 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 

-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1628

 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1666

 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1688

 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1718

 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "


@@ -3013,12 +3064,12 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)

-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733

 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1856

 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "


@@ -3027,12 +3078,12 @@ msgstr ""
 "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv "
 "(fordi arkitekturen manglar)."
 
 "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv "
 "(fordi arkitekturen manglar)."
 

-#: apt-pkg/acquire-item.cc:1771
+#: apt-pkg/acquire-item.cc:1922

 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1980

 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."


@@ -3069,73 +3120,59 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)"
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk"
 
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk"
 

-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Brukar monteringspunktet %s for CD-ROM\n"
-"Monterer CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identifiserer ... "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Lagra etikett: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "Avmonterer CD-ROM ..."
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575

 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Brukar monteringspunktet %s for CD-ROM\n"
 
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Brukar monteringspunktet %s for CD-ROM\n"
 

-#: apt-pkg/cdrom.cc:660
-msgid "Unmounting CD-ROM\n"
-msgstr "Avmonterer CD-ROM\n"
-
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588

 msgid "Waiting for disc...\n"
 msgstr "Ventar på disk ...\n"
 
 msgid "Waiting for disc...\n"
 msgstr "Ventar på disk ...\n"
 

-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597

 msgid "Mounting CD-ROM...\n"
 msgstr "Monterer CD-ROM ...\n"
 
 msgid "Mounting CD-ROM...\n"
 msgstr "Monterer CD-ROM ...\n"
 

-#: apt-pkg/cdrom.cc:693
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying... "
+msgstr "Identifiserer ... "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Lagra etikett: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Avmonterer CD-ROM ...\n"
+
+#: apt-pkg/cdrom.cc:667
+msgid "Scanning disc for index files...\n"

 msgstr "Leitar etter indeksfiler på disken ...\n"
 
 msgstr "Leitar etter indeksfiler på disken ...\n"
 

-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717

 #, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n"
 
 #, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n"
 

-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728

 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755

 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "Lagra etikett: %s \n"
 
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "Lagra etikett: %s \n"
 

-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784

 msgid "That is not a valid name, try again.\n"
 msgstr "Det er ikkje eit gyldig namn, prøv igjen.\n"
 
 msgid "That is not a valid name, try again.\n"
 msgstr "Det er ikkje eit gyldig namn, prøv igjen.\n"
 

-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801

 #, c-format
 msgid ""
 "This disc is called: \n"
 #, c-format
 msgid ""
 "This disc is called: \n"


@@ -3144,15 +3181,15 @@ msgstr ""
 "Disken vert kalla: \n"
 "«%s»\n"
 
 "Disken vert kalla: \n"
 "«%s»\n"
 

-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803

 msgid "Copying package lists..."
 msgstr "Kopierer pakkelister ..."
 
 msgid "Copying package lists..."
 msgstr "Kopierer pakkelister ..."
 

-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838

 msgid "Writing new source list\n"
 msgstr "Skriv ny kjeldeliste\n"
 
 msgid "Writing new source list\n"
 msgstr "Skriv ny kjeldeliste\n"
 

-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846

 msgid "Source list entries for this disc are:\n"
 msgstr "Kjeldelisteoppføringar for denne disken er:\n"
 
 msgid "Source list entries for this disc are:\n"
 msgstr "Kjeldelisteoppføringar for denne disken er:\n"
 


@@ -3186,49 +3223,54 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr "Feil MD5-sum"
 
 msgid "Hash mismatch for: %s"
 msgstr "Feil MD5-sum"
 

-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:479

 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Fann ikkje utgåva «%s» av «%s»"
 
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Fann ikkje utgåva «%s» av «%s»"
 

-#: apt-pkg/cacheset.cc:470
+#: apt-pkg/cacheset.cc:482

 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Fann ikkje versjonen «%s» av «%s»"
 
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Fann ikkje versjonen «%s» av «%s»"
 

-#: apt-pkg/cacheset.cc:581
+#: apt-pkg/cacheset.cc:593

 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Fann ikkje pakken %s"
 
 #, fuzzy, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Fann ikkje pakken %s"
 

-#: apt-pkg/cacheset.cc:587
+#: apt-pkg/cacheset.cc:599

 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Fann ikkje pakken %s"
 
 #, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Fann ikkje pakken %s"
 

-#: apt-pkg/cacheset.cc:598
+#: apt-pkg/cacheset.cc:605
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Fann ikkje pakken %s"
+
+#: apt-pkg/cacheset.cc:616

 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612
+#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630

 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:619
+#: apt-pkg/cacheset.cc:637

 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:627
+#: apt-pkg/cacheset.cc:645

 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 

-#: apt-pkg/cacheset.cc:635
+#: apt-pkg/cacheset.cc:653

 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""


@@ -3253,12 +3295,12 @@ msgstr ""
 msgid "Execute external solver"
 msgstr ""
 
 msgid "Execute external solver"
 msgstr ""
 

-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51

 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 
 #, c-format
 msgid "Progress: [%3i%%]"
 msgstr ""
 

-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168

 msgid "Running dpkg"
 msgstr ""
 
 msgid "Running dpkg"
 msgstr ""
 


@@ -3276,12 +3318,12 @@ msgstr ""
 msgid "Installing %s"
 msgstr "  Installert: "
 
 msgid "Installing %s"
 msgstr "  Installert: "
 

-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977

 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Koplar til %s"
 
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Koplar til %s"
 

-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984

 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Opnar %s"
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Opnar %s"


@@ -3302,107 +3344,111 @@ msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
 msgstr ""
 
 #. FIXME: use a better string after freeze

-#: apt-pkg/deb/dpkgpm.cc:809
+#: apt-pkg/deb/dpkgpm.cc:808

 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Listekatalogen %spartial manglar."
 
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Listekatalogen %spartial manglar."
 

-#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846
+#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845

 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikkje opna fila %s"
 
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikkje opna fila %s"
 

-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:970

 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Opnar %s"
 
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Opnar %s"
 

-#: apt-pkg/deb/dpkgpm.cc:972
+#: apt-pkg/deb/dpkgpm.cc:971

 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Opnar %s"
 
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Opnar %s"
 

-#: apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:976

 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Opnar oppsettsfila %s"
 
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Opnar oppsettsfila %s"
 

-#: apt-pkg/deb/dpkgpm.cc:979
+#: apt-pkg/deb/dpkgpm.cc:978

 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Installert: "
 
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Installert: "
 

-#: apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:983

 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:985

 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Tilrådingar"
 
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Tilrådingar"
 

-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:990

 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Opnar oppsettsfila %s"
 
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Opnar oppsettsfila %s"
 

-#: apt-pkg/deb/dpkgpm.cc:992
+#: apt-pkg/deb/dpkgpm.cc:991

 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Klarte ikkje fjerna %s"
 
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Klarte ikkje fjerna %s"
 

-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1046
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070

 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Klarte ikkje skriva til %s"
 
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Klarte ikkje skriva til %s"
 

-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1049

 msgid "Is /dev/pts mounted?"
 msgstr ""
 
 msgid "Is /dev/pts mounted?"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1070

 msgid "Is stdout a terminal?"
 msgstr ""
 
 msgid "Is stdout a terminal?"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1558

 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1620

 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error

-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1625

 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1627

 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1633

 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1640

 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653

 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1674

 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""


@@ -3431,6 +3477,16 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
 msgid "Not locked"
 msgstr ""
 

+#~ msgid "%s not a valid DEB package."
+#~ msgstr "%s er ingen gyldig DEB-pakke."
+
+#~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Brukar monteringspunktet %s for CD-ROM\n"
+#~ "Monterer CD-ROM\n"
+

 #, fuzzy
 #~ msgid "Note, selecting '%s' for task '%s'\n"
 #~ msgstr "Merk, vel %s i staden for regex «%s»\n"
 #, fuzzy
 #~ msgid "Note, selecting '%s' for task '%s'\n"
 #~ msgstr "Merk, vel %s i staden for regex «%s»\n"