Merge remote-tracking branch 'mvo/debian/sid' into debian/experimental-no-abi-break

[apt.git] / po / nb.po

diff --git a/po/nb.po b/po/nb.po
index 84c467fcb04bd5a8b51950a8de9638cd602ea7cd..bdd00052dfeb3b434d3c742314f259628f153143 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "Project-Id-Version: apt\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-01-18 21:25+0100\n"

 "PO-Revision-Date: 2010-09-01 21:10+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "PO-Revision-Date: 2010-09-01 21:10+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"


@@ -104,7 +104,7 @@ msgstr "Pakkefila %s er ikke oppdatert."
 #: 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:113 apt-private/private-show.cc:115

 msgid "No packages found"
 msgstr "Fant ingen pakker"
 
 msgid "No packages found"
 msgstr "Fant ingen pakker"
 


@@ -161,8 +161,8 @@ msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
 #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
 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-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591

 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"


@@ -527,11 +527,11 @@ msgstr "Klarte ikke å behandle forutsetningene for bygging"
 msgid "Changelog for %s (%s)"
 msgstr "Kobler til %s (%s)"
 
 msgid "Changelog for %s (%s)"
 msgstr "Kobler til %s (%s)"
 

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

 msgid "Supported modules:"
 msgstr "Støttede moduler:"
 
 msgid "Supported modules:"
 msgstr "Støttede moduler:"
 

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

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


@@ -646,7 +646,7 @@ msgid "%s was already not hold.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
 #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
 msgstr "%s er allerede nyeste versjon.\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/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217

 #: apt-pkg/deb/dpkgpm.cc:1178
 #, c-format
 msgid "Waited for %s but it wasn't there"
 #: apt-pkg/deb/dpkgpm.cc:1178
 #, c-format
 msgid "Waited for %s but it wasn't there"


@@ -693,13 +693,16 @@ 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"

+" remove  - remove packages\n"
+"\n"

 " upgrade - upgrade the systems packages\n"
 "\n"
 " edit-sources - edit the source information file\n"
 " upgrade - upgrade the systems packages\n"
 "\n"
 " edit-sources - edit the source information file\n"


@@ -738,11 +741,11 @@ msgid "File not found"
 msgstr "Fant ikke fila"
 
 #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
 msgstr "Fant ikke fila"
 
 #: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114

-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/rred.cc:617 methods/rred.cc:626

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

-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623

 msgid "Failed to set modification time"
 msgstr "Klarte ikke å sette endringstidspunkt"
 
 msgid "Failed to set modification time"
 msgstr "Klarte ikke å sette endringstidspunkt"
 


@@ -817,9 +820,9 @@ msgstr "Et svar oversvømte bufferen."
 msgid "Protocol corruption"
 msgstr "Protokollødeleggelse"
 
 msgid "Protocol corruption"
 msgstr "Protokollødeleggelse"
 

-#: 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:458 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

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


@@ -1076,7 +1079,7 @@ msgstr "Forbindelsen mislykkes"
 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 ""
 


@@ -1324,101 +1327,101 @@ msgstr "Installer disse pakkene uten verifikasjon?"
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikke å skaffe %s  %s\n"
 
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikke å skaffe %s  %s\n"
 

-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:200

 msgid "installed,upgradable to: "
 msgstr ""
 
 msgid "installed,upgradable to: "
 msgstr ""
 

-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:206

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

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

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

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

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

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

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

-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:219

 msgid "[upgradable from: "
 msgstr ""
 
 msgid "[upgradable from: "
 msgstr ""
 

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

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

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

 msgid "The following packages have unmet dependencies:"
 msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
 
 msgid "The following packages have unmet dependencies:"
 msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
 

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

 #, 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:408

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

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

 msgid "but it is not installable"
 msgstr "men lar seg ikke installere"
 
 msgid "but it is not installable"
 msgstr "men lar seg ikke installere"
 

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

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

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

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

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

 msgid "but it is not going to be installed"
 msgstr "men skal ikke installeres"
 
 msgid "but it is not going to be installed"
 msgstr "men skal ikke installeres"
 

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

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

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

 msgid "The following NEW packages will be installed:"
 msgstr "Følgende NYE pakker vil bli installert:"
 
 msgid "The following NEW packages will be installed:"
 msgstr "Følgende NYE pakker vil bli installert:"
 

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

 msgid "The following packages will be REMOVED:"
 msgstr "Følgende pakker vil bli FJERNET:"
 
 msgid "The following packages will be REMOVED:"
 msgstr "Følgende pakker vil bli FJERNET:"
 

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

 msgid "The following packages have been kept back:"
 msgstr "Følgende pakker er holdt tilbake:"
 
 msgid "The following packages have been kept back:"
 msgstr "Følgende pakker er holdt tilbake:"
 

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

 msgid "The following packages will be upgraded:"
 msgstr "Følgende pakker vil bli oppgradert:"
 
 msgid "The following packages will be upgraded:"
 msgstr "Følgende pakker vil bli oppgradert:"
 

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

 msgid "The following packages will be DOWNGRADED:"
 msgstr "Følgende pakker vil bli NEDGRADERT:"
 
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Følgende pakker vil bli NEDGRADERT:"
 

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

 msgid "The following held packages will be changed:"
 msgstr "Følgende pakker vil bli endret:"
 
 msgid "The following held packages will be changed:"
 msgstr "Følgende pakker vil bli endret:"
 

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

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

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

 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"


@@ -1426,27 +1429,27 @@ msgstr ""
 "ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n"
 "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
 
 "ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n"
 "Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
 

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

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

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

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

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

 #, 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:666

 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
 
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
 

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

 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu pakker ikke fullt installert eller fjernet.\n"


@@ -1455,7 +1458,7 @@ msgstr "%lu pakker ikke fullt installert eller fjernet.\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:692

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


@@ -1463,21 +1466,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:698

 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:709

 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:715

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

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

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Kompileringsfeil i regulært uttrykk - %s"
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Kompileringsfeil i regulært uttrykk - %s"


@@ -1535,7 +1538,7 @@ msgstr "Utført"
 msgid "Full Text Search"
 msgstr ""
 
 msgid "Full Text Search"
 msgstr ""
 

-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:105

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


@@ -1551,12 +1554,12 @@ msgstr ""
 "      Husk også at låsing er deaktivert, så ikke regn med \n"
 "      relevans i forhold til den reelle gjeldende situasjonen."
 
 "      Husk også at låsing er deaktivert, så ikke regn med \n"
 "      relevans i forhold til den reelle gjeldende situasjonen."
 

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

 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Klarte ikke å endre navnet på %s til %s"
 
 #, fuzzy, c-format
 msgid "Failed to parse %s. Edit again? "
 msgstr "Klarte ikke å endre navnet 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 ""


@@ -1602,8 +1605,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:254
+#: apt-pkg/sourcelist.cc:260 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"


@@ -1641,24 +1644,6 @@ msgstr "Ingen speilfil «%s» funnet"
 msgid "[Mirror: %s]"
 msgstr "[Speil: %s]"
 
 msgid "[Mirror: %s]"
 msgstr "[Speil: %s]"
 

-#: 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 ""
-"Klarte ikke rette %s med mmap og med filoperasjonbruk - programrettelsen ser "
-"ut til å være korrupt."
-
-#: 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 ""
-"Klarte ikke rette %s med mmap (men ingen mmap-spesifikk feil) - "
-"programrettelsen ser ut til å være korrupt."
-

 #: methods/rsh.cc:99 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Klarte ikke å opprette IPC-rør til underprosessen"
 #: methods/rsh.cc:99 ftparchive/multicompress.cc:168
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Klarte ikke å opprette IPC-rør til underprosessen"


@@ -1704,12 +1689,12 @@ msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen."
 msgid "Merging available information"
 msgstr "Fletter tilgjengelig informasjon"
 
 msgid "Merging available information"
 msgstr "Fletter tilgjengelig informasjon"
 

-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100

 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s er ikke en gyldig debianpakke."
 
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "%s er ikke en gyldig debianpakke."
 

-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234

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


@@ -1734,12 +1719,12 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 

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

 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kan ikke skrive til %s"
 
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Kan ikke skrive til %s"
 

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

 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?"
 
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?"
 


@@ -2533,12 +2518,12 @@ msgstr "Underprosessen %s mottok et minnefeilsignal."
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok signalet %u."
 
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok signalet %u."
 

-#: 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 ga en feilkode (%u)"
 
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s ga en 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 avsluttet uventet"
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avsluttet uventet"


@@ -2591,7 +2576,7 @@ msgid "Problem syncing the file"
 msgstr "Problem ved oppdatering av fila"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 msgstr "Problem ved oppdatering av fila"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory

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

 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Ingen nøkkelring installert i %s."
 #, c-format
 msgid "No keyring installed in %s."
 msgstr "Ingen nøkkelring installert i %s."


@@ -2714,76 +2699,86 @@ msgstr "Klarer ikke å fortolke pakkefila %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarer ikke å fortolke pakkefila %s (2)"
 
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarer ikke å fortolke pakkefila %s (2)"
 

-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:84
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
+
+#: apt-pkg/sourcelist.cc:144

 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)"
 

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

 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)"
 

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

 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)"
 

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

 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)"
 

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

 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)"
 

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

 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Feil på linje %lu i kildelista %s (nettadresse)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Feil på linje %lu i kildelista %s (nettadresse)"
 

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

 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Feil på linje %lu i kildelista %s (dist)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Feil på linje %lu i kildelista %s (dist)"
 

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

 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
 

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

 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Feil på %lu i kildelista %s (Absolutt dist)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Feil på %lu i kildelista %s (Absolutt dist)"
 

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

 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Feil på %lu i kildelista %s (dist fortolking)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Feil på %lu i kildelista %s (dist fortolking)"
 

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

 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 
 #, c-format
 msgid "Opening %s"
 msgstr "Åpner %s"
 

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

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

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

 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Feil på %u i kildelista %s (type)"
 
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Feil på %u i kildelista %s (type)"
 

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

 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
 
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
 

+#: apt-pkg/sourcelist.cc:386
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen «%s» er ukjent i linje %u i kildelista %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 ""


@@ -2914,17 +2909,17 @@ msgid ""
 "available in the sources"
 msgstr ""
 
 "available in the sources"
 msgstr ""
 

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

 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ugyldig oppslag i foretrekksfila %s, manglende pakkehode"
 
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ugyldig oppslag i foretrekksfila %s, manglende pakkehode"
 

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

 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Forsto ikke spikring av typen %s"
 
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Forsto ikke spikring av typen %s"
 

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

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


@@ -3004,36 +2999,36 @@ msgstr "Feil størrelse"
 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:1561

 #, 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:1577

 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Klarer ikke å fortolke Release-fila %s"
 
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Klarer ikke å fortolke Release-fila %s"
 

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

 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n"
 
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n"
 

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

 #, 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:1679

 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
 
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
 

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

 #, 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 "


@@ -3043,12 +3038,12 @@ msgstr ""
 "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
 "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
 
 #. 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:1719 apt-pkg/acquire-item.cc:1724

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

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

 #, 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 "


@@ -3057,12 +3052,12 @@ msgstr ""
 "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken "
 "selv (fordi arkitekturen mangler)."
 
 "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken "
 "selv (fordi arkitekturen mangler)."
 

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

 #, 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:1971

 #, 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."


@@ -3292,12 +3287,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 "Kjører dpkg"
 
 msgid "Running dpkg"
 msgstr "Kjører dpkg"
 


@@ -3481,6 +3476,20 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
 msgid "Not locked"
 msgstr "Ikke låst"
 
 msgid "Not locked"
 msgstr "Ikke låst"
 

+#~ msgid ""
+#~ "Could not patch %s with mmap and with file operation usage - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Klarte ikke rette %s med mmap og med filoperasjonbruk - programrettelsen "
+#~ "ser ut til å være korrupt."
+
+#~ msgid ""
+#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch "
+#~ "seems to be corrupt."
+#~ msgstr ""
+#~ "Klarte ikke rette %s med mmap (men ingen mmap-spesifikk feil) - "
+#~ "programrettelsen ser ut til å være korrupt."
+

 #~ msgid "Note, selecting '%s' for task '%s'\n"
 #~ msgstr "Merk, velger «%s» for oppgaven «%s»\n"
 
 #~ msgid "Note, selecting '%s' for task '%s'\n"
 #~ msgstr "Merk, velger «%s» for oppgaven «%s»\n"