Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	configure.ac
	debian/changelog

1 files changed, 103 insertions, 105 deletions

diff --git a/po/sv.po b/po/sv.po
index 298573eea..fda0cac14 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-06 20:46+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+0100\n"
 "PO-Revision-Date: 2010-08-24 21:18+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n"
@@ -157,7 +157,7 @@ msgstr "  Paketnålning: "
 msgid "  Version table:"
 msgstr "  Versionstabell:"
 
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
 #: cmdline/apt-get.cc:1580 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
@@ -255,12 +255,12 @@ msgstr "Ange ett namn för denna skiva, exempelvis \"Debian 5.0.3 Disk 1\""
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Mata in en skiva i enheten och tryck på Enter"
 
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Misslyckades med att montera \"%s\" till \"%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 "Upprepa proceduren för resten av cd-skivorna i din uppsättning."
 
@@ -747,12 +747,12 @@ msgstr "Skivan hittades inte."
 msgid "File not found"
 msgstr "Filen hittades inte"
 
-#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118
-#: methods/rred.cc:598 methods/rred.cc:608
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
 msgid "Failed to stat"
 msgstr "Kunde inte ta status"
 
-#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
 msgid "Failed to set modification time"
 msgstr "Misslyckades ställa in ändringstid"
 
@@ -1021,7 +1021,7 @@ msgstr ""
 "Följande signaturer kunde inte verifieras för att den öppna nyckeln inte är "
 "tillgänglig:\n"
 
-#: methods/gzip.cc:64
+#: methods/gzip.cc:65
 msgid "Empty files can't be valid archives"
 msgstr ""
 
@@ -1345,108 +1345,108 @@ msgstr "Installera dessa paket utan verifiering?"
 msgid "Failed to fetch %s  %s\n"
 msgstr "Misslyckades med att hämta %s  %s\n"
 
-#: apt-private/private-output.cc:72 apt-private/private-show.cc:81
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
 #: apt-private/private-show.cc:86
 msgid "unknown"
 msgstr ""
 
-#: apt-private/private-output.cc:198
+#: apt-private/private-output.cc:201
 #, fuzzy, c-format
 msgid "[installed,upgradable to: %s]"
 msgstr " [Installerat]"
 
-#: apt-private/private-output.cc:202
+#: apt-private/private-output.cc:205
 #, fuzzy
 msgid "[installed,local]"
 msgstr " [Installerat]"
 
-#: apt-private/private-output.cc:205
+#: apt-private/private-output.cc:208
 msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:210
 #, fuzzy
 msgid "[installed,automatic]"
 msgstr " [Installerat]"
 
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:212
 #, fuzzy
 msgid "[installed]"
 msgstr " [Installerat]"
 
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:216
 #, c-format
 msgid "[upgradable from: %s]"
 msgstr ""
 
-#: apt-private/private-output.cc:217
+#: apt-private/private-output.cc:220
 msgid "[residual-config]"
 msgstr ""
 
-#: apt-private/private-output.cc:317
+#: apt-private/private-output.cc:320
 msgid "The following packages have unmet dependencies:"
 msgstr "Följande paket har beroenden som inte kan tillfredsställas:"
 
-#: apt-private/private-output.cc:407
+#: apt-private/private-output.cc:410
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s är installerat"
 
-#: apt-private/private-output.cc:409
+#: apt-private/private-output.cc:412
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s kommer att installeras"
 
-#: apt-private/private-output.cc:416
+#: apt-private/private-output.cc:419
 msgid "but it is not installable"
 msgstr "men det kan inte installeras"
 
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:421
 msgid "but it is a virtual package"
 msgstr "men det är ett virtuellt paket"
 
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
 msgid "but it is not installed"
 msgstr "men det är inte installerat"
 
-#: apt-private/private-output.cc:421
+#: apt-private/private-output.cc:424
 msgid "but it is not going to be installed"
 msgstr "men det kommer inte att installeras"
 
-#: apt-private/private-output.cc:426
+#: apt-private/private-output.cc:429
 msgid " or"
 msgstr " eller"
 
-#: apt-private/private-output.cc:455
+#: apt-private/private-output.cc:458
 msgid "The following NEW packages will be installed:"
 msgstr "Följande NYA paket kommer att installeras:"
 
-#: apt-private/private-output.cc:481
+#: apt-private/private-output.cc:484
 msgid "The following packages will be REMOVED:"
 msgstr "Följande paket kommer att TAS BORT:"
 
-#: apt-private/private-output.cc:503
+#: apt-private/private-output.cc:506
 msgid "The following packages have been kept back:"
 msgstr "Följande paket har hållits tillbaka:"
 
-#: apt-private/private-output.cc:524
+#: apt-private/private-output.cc:527
 msgid "The following packages will be upgraded:"
 msgstr "Följande paket kommer att uppgraderas:"
 
-#: apt-private/private-output.cc:545
+#: apt-private/private-output.cc:548
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Följande paket kommer att NEDGRADERAS:"
 
-#: apt-private/private-output.cc:565
+#: apt-private/private-output.cc:568
 msgid "The following held packages will be changed:"
 msgstr "Följande tillbakahållna paket kommer att ändras:"
 
-#: apt-private/private-output.cc:620
+#: apt-private/private-output.cc:623
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (på grund av %s) "
 
-#: apt-private/private-output.cc:628
+#: apt-private/private-output.cc:631
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
@@ -1454,27 +1454,27 @@ msgstr ""
 "VARNING: Följande systemkritiska paket kommer att tas bort.\n"
 "Detta bör INTE genomföras såvida du inte vet exakt vad du gör!"
 
-#: apt-private/private-output.cc:659
+#: apt-private/private-output.cc:662
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu att uppgradera, %lu att nyinstallera, "
 
-#: apt-private/private-output.cc:663
+#: apt-private/private-output.cc:666
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu att installera om, "
 
-#: apt-private/private-output.cc:665
+#: apt-private/private-output.cc:668
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu att nedgradera, "
 
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:670
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu att ta bort och %lu att inte uppgradera.\n"
 
-#: apt-private/private-output.cc:671
+#: apt-private/private-output.cc:674
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu är inte helt installerade eller borttagna.\n"
@@ -1483,7 +1483,7 @@ msgstr "%lu är inte helt installerade eller borttagna.\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.
-#: apt-private/private-output.cc:693
+#: apt-private/private-output.cc:696
 msgid "[Y/n]"
 msgstr "[J/n]"
 
@@ -1491,21 +1491,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.
-#: apt-private/private-output.cc:699
+#: 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
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:713
 msgid "Y"
 msgstr "J"
 
 #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:716
+#: apt-private/private-output.cc:719
 msgid "N"
 msgstr ""
 
-#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fel vid kompilering av reguljärt uttryck - %s"
@@ -1683,7 +1683,7 @@ msgstr "Ingen spegelfil \"%s\" hittades "
 msgid "[Mirror: %s]"
 msgstr "[Spegel: %s]"
 
-#: methods/rsh.cc:98 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Misslyckades med att skapa IPC-rör till underprocess"
 
@@ -2044,48 +2044,48 @@ msgstr "Felaktig override %s rad %lu #2"
 msgid "Malformed override %s line %llu #3"
 msgstr "Felaktig override %s rad %lu #3"
 
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Okänd komprimeringsalgoritm \"%s\""
 
 # ???
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Komprimerade utdata %s behöver en komprimeringsuppsättning"
 
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
 msgid "Failed to create FILE*"
 msgstr "Misslyckades med att skapa FILE*"
 
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
 msgid "Failed to fork"
 msgstr "Misslyckades med att grena process"
 
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
 msgid "Compress child"
 msgstr "Barnprocess för komprimering"
 
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Internt fel, misslyckades med att skapa %s"
 
-#: ftparchive/multicompress.cc:302
+#: ftparchive/multicompress.cc:303
 msgid "IO to subprocess/file failed"
 msgstr "In/ut för underprocess/fil misslyckades"
 
-#: ftparchive/multicompress.cc:340
+#: ftparchive/multicompress.cc:341
 msgid "Failed to read while computing MD5"
 msgstr "Misslyckades med att läsa vid beräkning av MD5"
 
-#: ftparchive/multicompress.cc:356
+#: ftparchive/multicompress.cc:357
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Problem med att länka ut %s"
 
-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Misslyckades med att byta namn på %s till %s"
@@ -2220,12 +2220,12 @@ msgstr "Omdirigeringen %s -> %s inlagd två gånger"
 msgid "Duplicate conf file %s/%s"
 msgstr "Duplicerad konfigurationsfil %s/%s"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
 #, c-format
 msgid "Failed to write file %s"
 msgstr "Misslyckades med att skriva filen %s"
 
-#: apt-inst/dirstream.cc:105
+#: apt-inst/dirstream.cc:106
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Misslyckades med att stänga filen %s"
@@ -2607,22 +2607,22 @@ msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar"
 msgid "write, still have %llu to write but couldn't"
 msgstr "skrivning, har fortfarande %lu att skriva men kunde inte"
 
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem med att stänga filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem med att byta namn på filen %s till %s"
 
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem med att avlänka filen %s"
 
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
 msgid "Problem syncing the file"
 msgstr "Problem med att synkronisera filen"
 
@@ -2883,7 +2883,7 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Kunde inte korrigera problemen, du har hållit tillbaka trasiga paket."
 
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr "Listkatalogen %spartial saknas."
@@ -3057,35 +3057,35 @@ msgstr "Storleken stämmer inte"
 msgid "Invalid file format"
 msgstr "Felaktig åtgärd %s"
 
-#: apt-pkg/acquire-item.cc:1561
+#: 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 ""
 
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1586
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Kunde inte tolka \"Release\"-filen %s"
 
-#: apt-pkg/acquire-item.cc:1619
+#: apt-pkg/acquire-item.cc:1628
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n"
 
-#: apt-pkg/acquire-item.cc:1657
+#: 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 ""
 
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1688
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)"
 
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1718
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3096,12 +3096,12 @@ msgstr ""
 "%s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-fel: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1847
+#: 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 "
@@ -3110,12 +3110,12 @@ msgstr ""
 "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du "
 "manuellt måste reparera detta paket (på grund av saknad arkitektur)."
 
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1922
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1980
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -3151,50 +3151,41 @@ msgstr "Ogiltig \"Date\"-post i Release-filen %s"
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Leverantörsblocket %s saknar fingeravtryck"
 
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-"Använder cd-rom-monteringspunkten %s\n"
-"Monterar cd-rom\n"
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr "Identifierar.. "
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr "Lagrad etikett: %s \n"
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-msgid "Unmounting CD-ROM...\n"
-msgstr "Avmonterar cd-rom...\n"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Använder cd-rom-monteringspunkten %s\n"
 
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
 msgid "Unmounting CD-ROM\n"
 msgstr "Avmonterar cd-rom\n"
 
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
 msgid "Waiting for disc...\n"
 msgstr "Väntar på skiva...\n"
 
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
 msgid "Mounting CD-ROM...\n"
 msgstr "Monterar cd-rom...\n"
 
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr "Identifierar.. "
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr "Lagrad etikett: %s \n"
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+msgid "Unmounting CD-ROM...\n"
+msgstr "Avmonterar cd-rom...\n"
+
+#: apt-pkg/cdrom.cc:667
 msgid "Scanning disc for index files..\n"
 msgstr "Söker efter indexfiler på skivan...\n"
 
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
@@ -3203,7 +3194,7 @@ msgstr ""
 "Hittade %zu paketindex, %zu källkodsindex, %zu översättningsindex och %zu "
 "signaturer\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?"
@@ -3211,16 +3202,16 @@ msgstr ""
 "Kunde inte hitta några paketfiler. Detta är kanske inte en Debian-skiva "
 "eller felaktig arkitektur?"
 
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Hittade etiketten \"%s\"\n"
 
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
 msgid "That is not a valid name, try again.\n"
 msgstr "Namnet är ogiltigt, försök igen.\n"
 
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -3229,15 +3220,15 @@ msgstr ""
 "Denna skiva heter: \n"
 "\"%s\"\n"
 
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
 msgid "Copying package lists..."
 msgstr "Kopierar paketlistor..."
 
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
 msgid "Writing new source list\n"
 msgstr "Skriver ny källista\n"
 
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
 msgid "Source list entries for this disc are:\n"
 msgstr "Poster i källistan för denna skiva:\n"
 
@@ -3543,6 +3534,13 @@ msgid "Not locked"
 msgstr "Inte låst"
 
 #~ msgid ""
+#~ "Using CD-ROM mount point %s\n"
+#~ "Mounting CD-ROM\n"
+#~ msgstr ""
+#~ "Använder cd-rom-monteringspunkten %s\n"
+#~ "Monterar cd-rom\n"
+
+#~ msgid ""
 #~ "Could not patch %s with mmap and with file operation usage - the patch "
 #~ "seems to be corrupt."
 #~ msgstr ""