diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2007-07-16 23:05:01 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2007-07-16 23:05:01 -0300 |
commit | 23e8503647b9da6f2f12226d25a4740c32e54b7f (patch) | |
tree | c880482534f5708d258575ea864a82e7dc317c36 | |
parent | 2dfc3bb89a0696f0e9891b25869f82225cb58289 (diff) | |
parent | 5ffd03998b01c174298ddb3f2f914f59bdee7481 (diff) |
Another sync with Christian
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | methods/http.cc | 33 | ||||
-rw-r--r-- | po/sv.po | 478 |
3 files changed, 272 insertions, 241 deletions
diff --git a/debian/changelog b/debian/changelog index a497bea96..48429c9da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,7 @@ apt (0.7.4) UNRELEASED; urgency=low * French translation update * Re-generate PO(T) files * Spanish translation update + * Swedish translation update -- Otavio Salvador <otavio@ossystems.com.br> Sat, 14 Jul 2007 15:52:15 -0300 @@ -2569,4 +2570,3 @@ apt (0.0.1) unstable; urgency=low * Initial Release. -- Scott K. Ellis <scott@debian.org> Tue, 31 Mar 1998 12:49:28 -0500 - diff --git a/methods/http.cc b/methods/http.cc index 068d26978..d4e231fbe 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -1164,25 +1164,24 @@ int HttpMethod::Loop() URIDone(Res); } else - { - if (Server->ServerFd == -1) + { + if (Server->ServerFd == -1) + { + FailCounter++; + _error->Discard(); + Server->Close(); + + if (FailCounter >= 2) { - FailCounter++; - _error->Discard(); - Server->Close(); - - if (FailCounter >= 2) - { - Fail(_("Connection failed"),true); - FailCounter = 0; - } - - QueueBack = Queue; + Fail(_("Connection failed"),true); + FailCounter = 0; } - else - Fail(true); - } - + + QueueBack = Queue; + } + else + Fail(true); + } break; } @@ -1,6 +1,6 @@ # Advanced Package Tool - APT message translation catalog # Swedish messages -# Peter Karlsson <peterk@debian.org>, 2002-2005. +# Peter Karlsson <peterk@debian.org>, 2002-2007. # Daniel Nylander <po@danielnylander.se>, 2005. # msgid "" @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-07-06 06:51+0200\n" -"PO-Revision-Date: 2006-08-18 15:45+0100\n" -"Last-Translator: Daniel Nylander <po@danielnylander.se>\n" -"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" +"PO-Revision-Date: 2007-07-14 18:39+0100\n" +"Last-Translator: Peter Karlsson <peterk@debian.org>\n" +"Language-Team: Swedish <debian-l10n-swedish@debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,14 +18,14 @@ msgstr "" #: cmdline/apt-cache.cc:143 #, c-format msgid "Package %s version %s has an unmet dep:\n" -msgstr "Paket %s version %s har ett beroende som inte kan tillfredsst�llas:\n" +msgstr "Paketet %s med versionen %s har ett beroende som inte kan tillfredsst�llas:\n" #: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 #: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 #: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 #, c-format msgid "Unable to locate package %s" -msgstr "Kunde inte lokalisera paket %s" +msgstr "Kunde inte hitta paket %s" #: cmdline/apt-cache.cc:247 msgid "Total package names : " @@ -41,11 +41,11 @@ msgstr " Rent virtuella paket: " #: cmdline/apt-cache.cc:289 msgid " Single virtual packages: " -msgstr " Enkelt virtuella paket: " +msgstr " Enstaka virtuella paket: " #: cmdline/apt-cache.cc:290 msgid " Mixed virtual packages: " -msgstr " Blandat virtuella paket: " +msgstr " Blandade virtuella paket: " #: cmdline/apt-cache.cc:291 msgid " Missing: " @@ -56,9 +56,8 @@ msgid "Total distinct versions: " msgstr "Totalt antal olika versioner: " #: cmdline/apt-cache.cc:295 -#, fuzzy msgid "Total Distinct Descriptions: " -msgstr "Totalt antal olika versioner: " +msgstr "Totalt antal olika beskrivningar: " #: cmdline/apt-cache.cc:297 msgid "Total dependencies: " @@ -69,9 +68,8 @@ msgid "Total ver/file relations: " msgstr "Totalt antal version/filrelationer: " #: cmdline/apt-cache.cc:302 -#, fuzzy msgid "Total Desc/File relations: " -msgstr "Totalt antal version/filrelationer: " +msgstr "Totalt antal beskrivning/filrelationer: " #: cmdline/apt-cache.cc:304 msgid "Total Provides mappings: " @@ -112,7 +110,7 @@ msgstr "\"Package\"-filer:" #: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Cachen �r ur synk, kan inte korsreferera en paketfil" +msgstr "Cachen �r inte synkroniserad, kan inte korsreferera en paketfil" # Prioritet f�ljt av URI #: cmdline/apt-cache.cc:1532 @@ -127,7 +125,7 @@ msgstr "Fastn�lade paket:" #: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 msgid "(not found)" -msgstr "(ej funnen)" +msgstr "(hittades inte)" #. Installed version #: cmdline/apt-cache.cc:1577 @@ -233,26 +231,26 @@ msgstr "" " -p=? Paketcachen.\n" " -s=? K�llcachen.\n" " -q Inaktivera f�rloppsindikatorn.\n" -" -i Visa endast viktiga beroendeen f�r \"unmet\"-kommandot.\n" -" -c=? L�s denna inst�llningsfil.\n" -" -o=? Ange valfri inst�llningsflagga. T.ex -o dir::cache=/tmp\n" +" -i Visa endast viktiga beroenden f�r \"unmet\"-kommandot.\n" +" -c=? L�s denna konfigurationsfil.\n" +" -o=? St�ll in en godtycklig konfigurationsflagga. T.ex -o dir::cache=/tmp\n" "Se manualsidorna f�r apt-cache(8) och apt.conf(5) f�r mer information.\n" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Ange ett namn f�r denna skiva, s�som \"Debian 2.1r1 Disk 1\"" +msgstr "Ange ett namn f�r denna skiva, exempelvis \"Debian 2.1r1 Disk 1\"" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" -msgstr "Mata in skivan i enheten och tryck Enter" +msgstr "Mata in skivan i enheten och tryck p� Enter" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Repetera denna process f�r resten av CD-skivorna i din upps�ttning." +msgstr "Repetera denna process f�r resten av cd-skivorna i din upps�ttning." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" -msgstr "Flaggorna gavs inte parvis" +msgstr "Argumentetn gavs inte parvis" #: cmdline/apt-config.cc:76 msgid "" @@ -271,16 +269,16 @@ msgid "" msgstr "" "Anv�ndning: apt-config [flaggor] kommando\n" "\n" -"apt-config �r ett enkelt verktyg f�r att l�sa APTs inst�llningsfil\n" +"apt-config �r ett enkelt verktyg f�r att l�sa APTs konfigurationsfil\n" "\n" "Kommandon:\n" " shell - Skall�ge.\n" -" dump - Visa inst�llningen.\n" +" dump - Visa konfiguraitonen.\n" "\n" "Flaggor:\n" " -h Denna hj�lptext.\n" -" -c=? L�s denna inst�llningsfil.\n" -" -o=? Ange valfri inst�llningsflagga. T.ex -o dir::cache=/tmp\n" +" -c=? L�s denna konfigurationsfil.\n" +" -o=? St�ll in en godtycklig konfigurationsflagga. T.ex -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format @@ -308,8 +306,8 @@ msgstr "" "Flaggor:\n" " -h Denna hj�lptext.\n" " -t St�ll in tempor�rkatalogen.\n" -" -c=? L�s denna inst�llningsfil.\n" -" -o=? Ange valfri inst�llningsflagga. T.ex -o dir::cache=/tmp\n" +" -c=? L�s denna konfigurationsfil.\n" +" -o=? St�ll in en godtycklig konfigurationsflagga. T.ex -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format @@ -318,7 +316,7 @@ msgstr "Kunde inte skriva till %s" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Kan inte ta reda p� debconfs version. �r debconf installerat?" +msgstr "Kan inte ta reda p� debconf-version. �r debconf installerat?" #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" @@ -342,7 +340,7 @@ msgstr "Fel vid skrivning av huvud till inneh�llsfil" #: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" -msgstr "Fel vid behaldning av inneh�llet %s" +msgstr "Fel vid behandling av inneh�llet %s" #: ftparchive/apt-ftparchive.cc:553 msgid "" @@ -420,10 +418,10 @@ msgstr "" " -s=? K�llkods-override-fil\n" " -q Tyst\n" " -d=? V�ljer den valfria cachedatabasen\n" -" --no-delink Aktivera \"delinkning\"-felsp�rningsl�get\n" +" --no-delink Aktivera \"delinkning\"-fels�kningsl�get\n" " --contents Styr skapande av contents-fil\n" " -c=? L�s denna konfigurationsfil\n" -" -o=? Ange valfri inst�llningsflagga" +" -o=? St�ll in en godtycklig konfigurationsflagga" #: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" @@ -442,7 +440,7 @@ msgstr "DB var skadad, filen omd�pt till %s.old" #: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "DB �r f�r gammal, f�rs�ker uppgradera %s" +msgstr "DB �r gammal, f�rs�ker uppgradera %s" #: ftparchive/cachedb.cc:72 msgid "" @@ -516,7 +514,7 @@ msgstr " Avl�nka %s [%s]\n" #: ftparchive/writer.cc:261 #, c-format msgid "Failed to readlink %s" -msgstr "Misslyckades med att l�sa l�nk %s" +msgstr "Misslyckades med att l�sa l�nken %s" #: ftparchive/writer.cc:265 #, c-format @@ -531,7 +529,7 @@ msgstr "*** Misslyckades med att l�nka %s till %s" #: ftparchive/writer.cc:282 #, c-format msgid " DeLink limit of %sB hit.\n" -msgstr " Avl�nkningsgr�ns p� %sB n�dd.\n" +msgstr " Avl�nkningsgr�nsen p� %sB n�dd.\n" # F�lt vid namn "Package" #: ftparchive/writer.cc:386 @@ -547,7 +545,7 @@ msgstr " %s har ingen post i override-filen\n" #: ftparchive/writer.cc:439 ftparchive/writer.cc:697 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " ansvarig f�r %s �r %s ej %s\n" +msgstr " ansvarig f�r paketet %s �r %s ej %s\n" #: ftparchive/writer.cc:619 #, c-format @@ -603,7 +601,7 @@ msgstr "Ok�nd komprimeringsalgoritm \"%s\"" #: ftparchive/multicompress.cc:101 #, c-format msgid "Compressed output %s needs a compression set" -msgstr "Komprimerad utdata %s beh�ver en komprimeringsupps�ttning" +msgstr "Komprimerade utdata %s beh�ver en komprimeringsupps�ttning" #: ftparchive/multicompress.cc:168 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" @@ -632,7 +630,7 @@ msgstr "Misslyckades med att skapa underprocess-IPC" #: ftparchive/multicompress.cc:320 msgid "Failed to exec compressor " -msgstr "Misslyckades med att starta packare " +msgstr "Misslyckades med att starta komprimerare " #: ftparchive/multicompress.cc:359 msgid "decompressor" @@ -640,7 +638,7 @@ msgstr "uppackare" #: ftparchive/multicompress.cc:402 msgid "IO to subprocess/file failed" -msgstr "Barnprocessen misslyckades" +msgstr "In/ut f�r underprocess/fil misslyckades" #: ftparchive/multicompress.cc:454 msgid "Failed to read while computing MD5" @@ -663,7 +661,7 @@ msgstr "J" #: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672 #, c-format msgid "Regex compilation error - %s" -msgstr "Fel vid tolkning av regulj�rt uttryck - %s" +msgstr "Fel vid kompilering av regulj�rt uttryck - %s" #: cmdline/apt-get.cc:238 msgid "The following packages have unmet dependencies:" @@ -721,7 +719,7 @@ msgstr "F�ljande paket kommer att NEDGRADERAS:" #: cmdline/apt-get.cc:486 msgid "The following held packages will be changed:" -msgstr "F�ljande h�llna paket kommer att �ndras:" +msgstr "F�ljande tillbakah�llna paket kommer att �ndras:" #: cmdline/apt-get.cc:539 #, c-format @@ -734,7 +732,7 @@ msgid "" "This should NOT be done unless you know exactly what you are doing!" msgstr "" "VARNING: F�ljande systemkritiska paket kommer att tas bort\n" -"Detta b�r INTE g�ras s�vida du inte vet exakt vad du g�r!" +"Detta b�r INTE genomf�ras s�vida du inte vet exakt vad du g�r!" #: cmdline/apt-get.cc:578 #, c-format @@ -763,7 +761,7 @@ msgstr "%lu ej helt installerade eller borttagna.\n" #: cmdline/apt-get.cc:664 msgid "Correcting dependencies..." -msgstr "R�ttar till beroenden...." +msgstr "Korrigerar beroenden...." #: cmdline/apt-get.cc:667 msgid " failed." @@ -771,7 +769,7 @@ msgstr " misslyckades." #: cmdline/apt-get.cc:670 msgid "Unable to correct dependencies" -msgstr "Kunde inte r�tta till beroenden" +msgstr "Kunde inte korrigera beroenden" #: cmdline/apt-get.cc:673 msgid "Unable to minimize the upgrade set" @@ -788,7 +786,7 @@ msgstr "" #: cmdline/apt-get.cc:682 msgid "Unmet dependencies. Try using -f." -msgstr "Otillfredsst�llda beroenden. F�rs�k med -f." +msgstr "Otillfredsst�llda beroenden. Prova med -f." #: cmdline/apt-get.cc:704 msgid "WARNING: The following packages cannot be authenticated!" @@ -812,11 +810,11 @@ msgstr "Problem har uppst�tt och -y anv�ndes utan --force-yes" #: cmdline/apt-get.cc:770 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "Internt fel. InstallPackages kallades upp med brutna paket!" +msgstr "Internt fel. InstallPackages anropades med trasiga paket!" #: cmdline/apt-get.cc:779 msgid "Packages need to be removed but remove is disabled." -msgstr "Paket m�ste tas bort men \"Remove\" �r inaktiverat." +msgstr "Paketen m�ste tas bort men \"Remove\" �r inaktiverat." #: cmdline/apt-get.cc:790 msgid "Internal error, Ordering didn't finish" @@ -824,7 +822,7 @@ msgstr "Internt fel. Sorteringen f�rdigst�lldes inte" #: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043 msgid "Unable to lock the download directory" -msgstr "Kunde inte l�sa h�mtningskatalogen." +msgstr "Kunde inte l�sa h�mtningskatalogen" #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332 #: apt-pkg/cachefile.cc:63 @@ -850,22 +848,22 @@ msgstr "Beh�ver h�mta %sB arkiv.\n" #: cmdline/apt-get.cc:844 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Efter uppackning kommer %sB ytterligare diskutrymme att anv�ndas.\n" +msgstr "Efter uppackning kommer ytterligare %sB utrymme anv�ndas p� disken.\n" #: cmdline/apt-get.cc:847 #, c-format msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Efter uppackning kommer %sB frig�ras p� disken.\n" +msgstr "Efter uppackning kommer %sB att frig�ras p� disken.\n" #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186 #, c-format msgid "Couldn't determine free space in %s" -msgstr "Kunde inte l�sa av ledigt utrymme i %s" +msgstr "Kunde inte fastst�lla ledigt utrymme i %s" #: cmdline/apt-get.cc:864 #, c-format msgid "You don't have enough free space in %s." -msgstr "Du har inte tillr�ckligt ledigt utrymme i %s" +msgstr "Du har inte tillr�ckligt mycket ledigt utrymme i %s" #: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899 msgid "Trivial Only specified but this is not a trivial operation." @@ -882,8 +880,8 @@ msgid "" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Du �r p� v�g att g�ra n�got som kan vara skadligt\n" -"Skriv frasen \"%s\" f�r att forts�tta\n" +"Du �r p� v�g att g�ra n�gonting som kan vara skadligt\n" +"Skriv in frasen \"%s\" f�r att forts�tta\n" " ?] " # Visas d� man svarar nej @@ -913,16 +911,16 @@ msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Vissa arkiv kunte inte h�mtas. Pr�va eventuellt \"apt-get update\" eller med " +"Vissa arkiv kunte inte h�mtas. Prova att k�ra \"apt-get update\" eller med " "--fix-missing." #: cmdline/apt-get.cc:1005 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing och mediabyte st�ds inte �nnu" +msgstr "--fix-missing och mediabyte st�ds inte f�r tillf�llet" #: cmdline/apt-get.cc:1010 msgid "Unable to correct missing packages." -msgstr "Kunde inte r�tta till saknade paket." +msgstr "Kunde inte korrigera saknade paket." #: cmdline/apt-get.cc:1011 msgid "Aborting install." @@ -942,7 +940,7 @@ msgstr "" #: cmdline/apt-get.cc:1073 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "Paketet %s �r inte installerat, s� tas inte bort\n" +msgstr "Paketet %s �r inte installerat, s� det tas inte bort\n" #: cmdline/apt-get.cc:1084 #, c-format @@ -955,7 +953,7 @@ msgstr " [Installerat]" #: cmdline/apt-get.cc:1101 msgid "You should explicitly select one to install." -msgstr "Du b�r explicit ange ett att installera." +msgstr "Du b�r uttryckligen ange ett att installera." #: cmdline/apt-get.cc:1106 #, c-format @@ -965,8 +963,8 @@ msgid "" "is only available from another source\n" msgstr "" "Paketet %s �r inte tillg�ngligt, men ett annat paket h�nvisar till det.\n" -"Detta betyder vanligen att paketet saknas, har blivit f�r�ldrat eller\n" -"bara �r tillg�ngligt fr�n andra k�llor\n" +"Det kan betyda att paketet saknas, har blivit f�r�ldrat eller endast\n" +"�r tillg�ngligt fr�n andra k�llor\n" #: cmdline/apt-get.cc:1125 msgid "However the following packages replace it:" @@ -1020,42 +1018,48 @@ msgstr "" #: cmdline/apt-get.cc:1433 msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "" +msgstr "Det �r inte meningen att vi ska ta bort n�got, kan inte starta AutoRemover" #: cmdline/apt-get.cc:1465 -#, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" -msgstr "F�ljande NYA paket kommer att installeras:" +msgstr "" +"F�ljande paket har installerats automatiskt och �r inte l�ngre n�dv�ndiga:" #: cmdline/apt-get.cc:1467 msgid "Use 'apt-get autoremove' to remove them." -msgstr "" +msgstr "Anv�nd \"apt-get autoremove\" f�r att ta bort dem." #: cmdline/apt-get.cc:1472 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" +"Hmm, det verkar som AutoRemover f�rst�rde n�got som verkligen\n" +"inte skulle h�nda. Skicka in en felrapport mot paketet apt." #: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753 msgid "The following information may help to resolve the situation:" msgstr "F�ljande information kan vara till hj�lp f�r att l�sa situationen:" #: cmdline/apt-get.cc:1479 -#, fuzzy msgid "Internal Error, AutoRemover broke stuff" -msgstr "Internt fel, probleml�saren br�t s�nder saker" +msgstr "Internt fel, AutoRemover f�rst�rde n�got" #: cmdline/apt-get.cc:1498 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade f�rst�rde n�got" +<<<<<<< TREE #: cmdline/apt-get.cc:1544 #, fuzzy, c-format +======= +#: cmdline/apt-get.cc:1544 +#, c-format +>>>>>>> MERGE-SOURCE msgid "Couldn't find task %s" -msgstr "Kunde inte hitta paketet %s" +msgstr "Kunde inte hitta funktionen %s" #: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695 #, c-format @@ -1065,12 +1069,17 @@ msgstr "Kunde inte hitta paketet %s" #: cmdline/apt-get.cc:1682 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Observera, v�ljer %s f�r regex \"%s\"\n" +msgstr "Observera, v�ljer %s f�r det regulj�ra uttrycket \"%s\"\n" +<<<<<<< TREE #: cmdline/apt-get.cc:1712 #, fuzzy, c-format +======= +#: cmdline/apt-get.cc:1712 +#, c-format +>>>>>>> MERGE-SOURCE msgid "%s set to manual installed.\n" -msgstr "men %s kommer att installeras" +msgstr "%s �r satt till manuellt installerad.\n" #: cmdline/apt-get.cc:1725 msgid "You might want to run `apt-get -f install' to correct these:" @@ -1082,7 +1091,7 @@ msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Otillfredsst�llda beroenden. F�rs�k med \"apt-get -f install\" utan paket " +"Otillfredsst�llda beroenden. Prova med \"apt-get -f install\" utan paket " "(eller ange en l�sning)." #: cmdline/apt-get.cc:1740 @@ -1092,10 +1101,10 @@ msgid "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." msgstr "" -"N�gra paket kunde inte installeras. Detta kan betyde att du har\n" -"bett om en om�jlig situation eller, om du anv�nder den instabila\n" -"distributionen, att n�gra kr�vda paket �nnu inte har skapats eller\n" -"lagts in fr�n \"Incoming\"." +"N�gra paket kunde inte installeras. Det kan betyda att du har beg�rt\n" +"en om�jlig situation eller, om du anv�nder den instabila utg�van\n" +"att n�gra n�dv�ndiga paket �nnu inte har skapats eller flyttats\n" +"ut fr�n \"Incoming\"." #: cmdline/apt-get.cc:1748 msgid "" @@ -1105,7 +1114,7 @@ msgid "" msgstr "" "Eftersom du bad om en enda handling �r det mycket troligt att paketet\n" "helt enkelt inte kan installeras och att en felrapport om detta b�r\n" -"skrivas." +"skickas in." #: cmdline/apt-get.cc:1756 msgid "Broken packages" @@ -1137,11 +1146,11 @@ msgstr "F�rdig" #: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986 msgid "Internal error, problem resolver broke stuff" -msgstr "Internt fel, probleml�saren br�t s�nder saker" +msgstr "Internt fel, probleml�saren f�rst�rde n�gonting" #: cmdline/apt-get.cc:2086 msgid "Must specify at least one package to fetch source for" -msgstr "Du m�ste ange �tminstone ett paket att h�mta k�llkod f�r" +msgstr "Du m�ste ange minst ett paket att h�mta k�llkod f�r" #: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350 #, c-format @@ -1151,12 +1160,12 @@ msgstr "Kunde inte hitta n�got k�llkodspaket f�r %s" #: cmdline/apt-get.cc:2165 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Hoppar �ver redan h�mtad fil \"%s\"\n" +msgstr "Hoppar �ver redan h�mtade filen \"%s\"\n" #: cmdline/apt-get.cc:2189 #, c-format msgid "You don't have enough free space in %s" -msgstr "Du har inte tillr�ckligt ledigt utrymme i %s" +msgstr "Du har inte tillr�ckligt mycket ledigt utrymme i %s" #: cmdline/apt-get.cc:2194 #, c-format @@ -1171,7 +1180,7 @@ msgstr "Beh�ver h�mta %sB k�llkodsarkiv.\n" #: cmdline/apt-get.cc:2203 #, c-format msgid "Fetch source %s\n" -msgstr "H�mtar k�llkod %s\n" +msgstr "H�mtar k�llkoden %s\n" #: cmdline/apt-get.cc:2234 msgid "Failed to fetch some archives." @@ -1180,7 +1189,7 @@ msgstr "Misslyckades med att h�mta vissa arkiv." #: cmdline/apt-get.cc:2262 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "Packar inte upp redan redan uppackad k�llkod i %s\n" +msgstr "Packar inte upp redan uppackad k�llkod i %s\n" #: cmdline/apt-get.cc:2274 #, c-format @@ -1190,7 +1199,7 @@ msgstr "Uppackningskommandot \"%s\" misslyckades.\n" #: cmdline/apt-get.cc:2275 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "Kontrollera att paketet \"dpkg-dev\" �r installerat.\n" +msgstr "F�rs�kra dig om att paketet \"dpkg-dev\" �r installerat.\n" #: cmdline/apt-get.cc:2292 #, c-format @@ -1203,12 +1212,12 @@ msgstr "Barnprocessen misslyckades" #: cmdline/apt-get.cc:2327 msgid "Must specify at least one package to check builddeps for" -msgstr "Du m�ste ange �tminstone ett paket att inh�mta byggberoenden f�r" +msgstr "Du m�ste ange minst ett paket att inh�mta byggberoenden f�r" #: cmdline/apt-get.cc:2355 #, c-format msgid "Unable to get build-dependency information for %s" -msgstr "Kunde inte h�mta byggberoendeinformation f�r %s" +msgstr "Kunde inte h�mta information on byggberoenden f�r %s" #: cmdline/apt-get.cc:2375 #, c-format @@ -1221,7 +1230,8 @@ msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"%s-beroendet p� %s kan inte tillfredsst�llas eftersom paketet %s inte hittas" +"%s-beroendet p� %s kan inte tillfredsst�llas eftersom paketet %s inte kan " +"hittas" #: cmdline/apt-get.cc:2479 #, c-format @@ -1230,35 +1240,39 @@ msgid "" "package %s can satisfy version requirements" msgstr "" "%s-beroendet p� %s kan inte tillfredsst�llas eftersom inga tillg�ngliga " -"versioner av paketet %s uppfyller versionskraven" +"versioner av paketet %s tillfredsst�ller versionskraven" #: cmdline/apt-get.cc:2514 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -"Misslyckades med att uppfylla %s-beroendet f�r %s: Det installerade paketet %" +"Misslyckades med att tillfredsst�lla %s-beroendet f�r %s: Det installerade paketet %" "s �r f�r nytt" #: cmdline/apt-get.cc:2539 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Misslyckades med att uppfylla %s-beroendet f�r %s: %s" +msgstr "Misslyckades med att tillfredsst�lla %s-beroendet f�r %s: %s" #: cmdline/apt-get.cc:2553 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Byggberoenden f�r %s kunde inte uppfyllas." +msgstr "Byggberoenden f�r %s kunde inte tillfredsst�llas." #: cmdline/apt-get.cc:2557 msgid "Failed to process build dependencies" -msgstr "Kunde inte hantera byggberoenden" +msgstr "Misslyckades med att behandla byggberoenden" #: cmdline/apt-get.cc:2589 msgid "Supported modules:" msgstr "Moduler som st�ds:" +<<<<<<< TREE #: cmdline/apt-get.cc:2630 #, fuzzy +======= +#: cmdline/apt-get.cc:2630 +>>>>>>> MERGE-SOURCE msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1312,6 +1326,7 @@ msgstr "" " upgrade - Utf�r en uppgradering\n" " install - Installera nya paket (paket �r libc6, inte libc6.deb)\n" " remove - Ta bort paket\n" +" purge - Ta bort och helt radera paket\n" " source - H�mta k�llkodsarkiv\n" " build-dep - Tillfredsst�ll byggberoenden f�r k�llkodspaket\n" " dist-upgrade - Uppgradering av distributionen, se apt-get(8)\n" @@ -1332,8 +1347,8 @@ msgstr "" " -u Visa �ven en lista �ver uppgraderade paket.\n" " -b Bygg k�llkodspaketet n�r det h�mtats.\n" " -V Visa pratsamma versionsnummer.\n" -" -c=? L�s denna inst�llningsfil.\n" -" -o=? Ange valfri inst�llningsflagga. T.ex -o dir::cache=/tmp\n" +" -c=? L�s denna konfigurationsfil.\n" +" -o=? St�ll in en godtycklig konfigurationsflagga. T.ex -o dir::cache=/tmp\n" "Se manualsidorna f�r apt-get(8), sources.list(5) och apt.conf(5)\n" "f�r mer information och flaggor.\n" " Denna APT har Speciella Ko-Krafter.\n" @@ -1376,9 +1391,9 @@ msgid "" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" -"Mediabyte: S�tt i disken med etiketten\n" +"Mediabyte: Mata in skivan med etiketten\n" " \"%s\"\n" -"i enhet \"%s\" och tryck Enter\n" +"i enheten \"%s\" och tryck p� Enter\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1405,41 +1420,41 @@ msgstr "" "Flaggor:\n" " -h Denna hj�lptext.\n" " -s Anv�nd k�llkodsfilssortering.\n" -" -c=? L�s denna inst�llningsfil.\n" -" -o=? Ange valfri inst�llningsflagga. T.ex -o dir::cache=/tmp\n" +" -c=? L�s denna konfigurationsfil.\n" +" -o=? St�ll in en godtycklig konfigurationsflagga. T.ex -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" -msgstr "Ogiltig standardinst�llning!" +msgstr "Felaktig standardinst�llning!" #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 #: dselect/install:104 dselect/update:45 msgid "Press enter to continue." -msgstr "Tryck Enter f�r att forts�tta." +msgstr "Tryck p� Enter f�r att forts�tta." # Note to translators: The following four messages belong together. It doesn't # matter where sentences start, but it has to fit in just these four lines, and # at only 80 characters per line, if possible. #: dselect/install:100 msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "Fel uppstod vid uppackning. Jag kommer st�lla in de paket som" +msgstr "Det uppstod fel vid uppackning. Jag kommer konfigurera de paket" #: dselect/install:101 msgid "packages that were installed. This may result in duplicate errors" -msgstr "installerades. Detta kan ge dubbla fel eller fel orsakade av" +msgstr "som installerades. Detta kan ge dubbla fel eller fel orsakade av" #: dselect/install:102 msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "saknade beroenden. Detta �r okej, bara felen ovanf�r detta" +msgstr "saknade beroenden. Detta �r okej, endast felen ovanf�r det h�r" #: dselect/install:103 msgid "" "above this message are important. Please fix them and run [I]nstall again" -msgstr "meddelande �r viktiga. F�rs�k r�tta till dem och [I]nstallera igen" +msgstr "meddelandet �r viktiga. F�rs�k korrigera dem och k�r [I]nstallera igen" #: dselect/update:30 msgid "Merging available information" -msgstr "L�gger in tillg�nglighetsinformation" +msgstr "Sammanfogar tillg�nglig information" #: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" @@ -1451,11 +1466,11 @@ msgstr "Misslyckades med att k�ra gzip" #: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 msgid "Corrupted archive" -msgstr "F�rd�rvat arkiv" +msgstr "Skadat arkiv" #: apt-inst/contrib/extracttar.cc:193 msgid "Tar checksum failed, archive corrupted" -msgstr "Tar-kontrollsumma misslyckades, arkiv trasigt" +msgstr "Tar-kontrollsumma misslyckades, arkivet skadat" #: apt-inst/contrib/extracttar.cc:296 #, c-format @@ -1468,7 +1483,7 @@ msgstr "Ogiltig arkivsignatur" #: apt-inst/contrib/arfile.cc:78 msgid "Error reading archive member header" -msgstr "Misslyckades med att l�sa huvud f�r arkivdel" +msgstr "Fel vid l�sning av huvud f�r arkivdel" #: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" @@ -1482,14 +1497,13 @@ msgstr "Arkivet �r f�r kort" msgid "Failed to read the archive headers" msgstr "Misslyckades med att l�sa arkivhuvuden" -# noden har inte n�gon l�nk till n�sta paket #: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" -msgstr "DropNode anropat p� ol�nkad nod" +msgstr "DropNode anropat p� fortfarande l�nkad nod" #: apt-inst/filelist.cc:412 msgid "Failed to locate the hash element!" -msgstr "Misslyckades med att hitta hash-element!" +msgstr "Misslyckades med att hitta hash-elementett!" #: apt-inst/filelist.cc:459 msgid "Failed to allocate diversion" @@ -1502,12 +1516,12 @@ msgstr "Internt fel i AddDiversion" #: apt-inst/filelist.cc:477 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "F�rs�ker skriva �ver en omdirigering, %s -> %s och %s/%s" +msgstr "F�rs�ker att skriva �ver en omdirigering, %s -> %s och %s/%s" #: apt-inst/filelist.cc:506 #, c-format msgid "Double add of diversion %s -> %s" -msgstr "Omdirigering %s -> %s inlagd tv� g�nger" +msgstr "Omdirigeringen %s -> %s inlagd tv� g�nger" #: apt-inst/filelist.cc:549 #, c-format @@ -1542,7 +1556,7 @@ msgstr "Katalogen %s �r omdirigerad" #: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Paketet f�rs�ker skriva till omdirigeringsm�let %s/%s" +msgstr "Paketet f�rs�ker att skriva till omdirigeringsm�let %s/%s" #: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" @@ -1561,11 +1575,10 @@ msgstr "Misslyckades med att hitta noden i sin hashkorg" msgid "The path is too long" msgstr "S�kv�gen �r f�r l�ng" -# ??? #: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Skriver �ver pakettr�ff utan version f�r %s" +msgstr "Skriv �ver pakettr�ff utan version f�r %s" #: apt-inst/extract.cc:431 #, c-format @@ -1597,11 +1610,11 @@ msgstr "Kunde inte skapa %s" #: apt-inst/deb/dpkgdb.cc:114 #, c-format msgid "Failed to stat %sinfo" -msgstr "Kunde inte ta status p� %sinfo" +msgstr "Misslyckades att ta status p� %sinfo" #: apt-inst/deb/dpkgdb.cc:119 msgid "The info and temp directories need to be on the same filesystem" -msgstr "Katalogerna info och temp m�ste ligga p� samma filsystem" +msgstr "Katalogerna info och temp m�ste vara p� samma filsystem" #. Build the status cache #: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748 @@ -1614,7 +1627,7 @@ msgstr "L�ser paketlistor" #: apt-inst/deb/dpkgdb.cc:176 #, c-format msgid "Failed to change to the admin dir %sinfo" -msgstr "Kunde inte g� till adminkatalogen %sinfo" +msgstr "Misslyckades att v�xla till adminkatalogen %sinfo" #: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 #: apt-inst/deb/dpkgdb.cc:444 @@ -1651,7 +1664,7 @@ msgstr "Misslyckades med att �ppna omdirigeringsfilen %sdiversions" #: apt-inst/deb/dpkgdb.cc:320 msgid "The diversion file is corrupted" -msgstr "Omdirigeringsfilen �r trasig" +msgstr "Omdirigeringsfilen �r skadad" #: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 #: apt-inst/deb/dpkgdb.cc:337 @@ -1665,7 +1678,7 @@ msgstr "Internt fel n�r en omdirigering skulle l�ggas till" #: apt-inst/deb/dpkgdb.cc:379 msgid "The pkg cache must be initialized first" -msgstr "Paketcachen m�ste ha initierats f�rst" +msgstr "Paketcachen m�ste f�rst initieras" #: apt-inst/deb/dpkgdb.cc:439 #, c-format @@ -1680,7 +1693,7 @@ msgstr "Felaktig ConfFile-sektion i statusfilen. Position %lu" #: apt-inst/deb/dpkgdb.cc:466 #, c-format msgid "Error parsing MD5. Offset %lu" -msgstr "Fel vid tolkning av MD5. Offset %lu" +msgstr "Fel vid tolkning av MD5. Position %lu" #: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 #, c-format @@ -1696,7 +1709,7 @@ msgstr "Detta �r inte ett giltigt DEB-arkiv, b�de \"%s\" och \"%s\" saknas" #: apt-inst/deb/debfile.cc:108 #, c-format msgid "Couldn't change to %s" -msgstr "Kunde inte g� till %s" +msgstr "Kunde inte byta till %s" #: apt-inst/deb/debfile.cc:134 msgid "Internal error, could not locate member" @@ -1725,7 +1738,7 @@ msgstr "" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" -msgstr "Fel cd" +msgstr "Fel cd-rom" #: methods/cdrom.cc:166 #, c-format @@ -1734,11 +1747,11 @@ msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande anv�nds." #: methods/cdrom.cc:171 msgid "Disk not found." -msgstr "Disk ej funnen." +msgstr "Skivan hittades inte." #: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" -msgstr "Filen ej funnen" +msgstr "Filen hittades inte" #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141 #: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243 @@ -1748,11 +1761,11 @@ msgstr "Kunde inte ta status" #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147 #: methods/rred.cc:240 msgid "Failed to set modification time" -msgstr "Misslyckades s�tta modifieringstid" +msgstr "Misslyckades st�lla in �ndringstid" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" -msgstr "Ogiltig URI, lokala URI:er f�r inte starta med //" +msgstr "Ogiltig URI, lokala URI:er f�r inte b�rja med //" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 @@ -1761,11 +1774,11 @@ msgstr "Loggar in" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" -msgstr "Kunde inte ta reda p� namn p� partner" +msgstr "Kunde inte fastst�lla namnet p� partnern" #: methods/ftp.cc:173 msgid "Unable to determine the local name" -msgstr "Kunde inte ta reda p� eget namn" +msgstr "Kunde inte fastst�lla det lokala namnet" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format @@ -1793,7 +1806,7 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Inloggningsskriptskommandot \"%s\" misslyckades, servern sade: %s" +msgstr "Kommandot \"%s\" i inloggningsskriptet misslyckades, servern sade: %s" #: methods/ftp.cc:291 #, c-format @@ -1802,7 +1815,7 @@ msgstr "TYPE misslyckades, servern sade: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" -msgstr "Inget svar p� f�rbindelsen inom tidsgr�nsen" +msgstr "Tidsgr�nsen f�r anslutningen �verskreds" #: methods/ftp.cc:335 msgid "Server closed the connection" @@ -1818,7 +1831,7 @@ msgstr "Ett svar spillde bufferten." #: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" -msgstr "Protokollet f�rd�rvat" +msgstr "Protokollet skadat" #: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232 msgid "Write error" @@ -1826,11 +1839,11 @@ msgstr "Skrivfel" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" -msgstr "Kunde inte skapa uttag (socket)" +msgstr "Kunde inte skapa ett uttag (socket)" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "Kunde inte ansluta datauttag (socket), inget svar inom tidsgr�ns" +msgstr "Kunde inte ansluta datauttaget (socket), inget svar inom tidsgr�ns" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1842,7 +1855,7 @@ msgstr "getaddrinfo kunde inte f� tag i ett lyssnande uttag (socket)" #: methods/ftp.cc:736 msgid "Could not bind a socket" -msgstr "Kunde inte binda uttag (socket)" +msgstr "Kunde inte binda ett uttag (socket)" #: methods/ftp.cc:740 msgid "Could not listen on the socket" @@ -1850,7 +1863,7 @@ msgstr "Kunde inte lyssna p� uttaget (socket)" #: methods/ftp.cc:747 msgid "Could not determine the socket's name" -msgstr "Kunde inte avg�ra uttagets namn (socket)" +msgstr "Kunde inte fastst�lla uttagets namn (socket)" #: methods/ftp.cc:779 msgid "Unable to send PORT command" @@ -1868,11 +1881,11 @@ msgstr "EPRT misslyckades, servern sade: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgr�ns" +msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgr�nsen" #: methods/ftp.cc:825 msgid "Unable to accept connection" -msgstr "Kunde inte ta emot anslutning" +msgstr "Kunde inte ta emot anslutningen" #: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303 msgid "Problem hashing file" @@ -1885,12 +1898,12 @@ msgstr "Kunde inte h�mta filen, servern sade \"%s\"" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" -msgstr "Datauttag (socket) fick inte svar inom tidsgr�ns" +msgstr "Datauttag (socket) fick inte svar inom tidsgr�nsen" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Data�verf�ring misslyckades, servern sade \"%s\"" +msgstr "Data�verf�ringen misslyckades, servern sade \"%s\"" # Statusmeddelande, byter fr�n substantiv till verb #. Get the files information @@ -1917,17 +1930,17 @@ msgstr "[IP: %s %s]" #: methods/connect.cc:80 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "Kunde inte skapa uttag (socket) f�r %s (f=%u t=%u p=%u)" +msgstr "Kunde inte skapa ett uttag (socket) f�r %s (f=%u t=%u p=%u)" #: methods/connect.cc:86 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "Kunde inte p�b�rja anslutning till %s:%s (%s)." +msgstr "Kunde inte initiera anslutningen till %s:%s (%s)." #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "Kunde inte ansluta till %s:%s (%s), tog f�r l�ng tid" +msgstr "Kunde inte ansluta till %s:%s (%s), anslutningen �verskred tidsgr�ns" #: methods/connect.cc:108 #, c-format @@ -1955,7 +1968,7 @@ msgstr "Tempor�rt fel vid uppslagning av \"%s\"" #: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" -msgstr "N�got ot�ckt h�nde n�r \"%s:%s\" slogs upp (%i)" +msgstr "N�got konstigt h�nde n�r \"%s:%s\" slogs upp (%i)" #: methods/connect.cc:223 #, c-format @@ -1969,27 +1982,27 @@ msgstr "Kunde inte komma �t nyckelring: \"%s\"" #: methods/gpgv.cc:100 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "E: Argumentslistan fr�n Acquire::gpgv::Options f�r l�ng. Avslutar." +msgstr "E: Argumentslistan fr�n Acquire::gpgv::Options �r f�r l�ng. Avslutar." #: methods/gpgv.cc:204 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -"Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!" +"Internt fel: Korrekt signatur men kunde inte fastst�lla nyckelns fingeravtryck?!" #: methods/gpgv.cc:209 msgid "At least one invalid signature was encountered." -msgstr "�tminstone en giltig signatur tr�ffades p�." +msgstr "Minst en ogiltig signatur tr�ffades p�." #: methods/gpgv.cc:213 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -"Kunde inte starta \"%s\" f�r att verifiera signatur (�r gnupg installerad?)" +"Kunde inte k�ra \"%s\" f�r att verifiera signatur (�r gnupg installerad?)" #: methods/gpgv.cc:218 msgid "Unknown error executing gpgv" -msgstr "Ok�nt fel vid exekvering av gpgv" +msgstr "Ok�nt fel vid k�rning av gpgv" #: methods/gpgv.cc:249 msgid "The following signatures were invalid:\n" @@ -2000,7 +2013,7 @@ msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -"F�ljande signaturer kunde inte verifieras f�r att den publika nyckeln inte " +"F�ljande signaturer kunde inte verifieras f�r att den �ppna nyckeln inte " "�r tillg�nglig:\n" #: methods/gzip.cc:64 @@ -2012,7 +2025,7 @@ msgstr "Kunde inte �ppna r�r f�r %s" #: methods/gzip.cc:109 #, c-format msgid "Read error from %s process" -msgstr "L�sfel p� %s-processen" +msgstr "L�sfel fr�n %s-processen" #: methods/http.cc:377 msgid "Waiting for headers" @@ -2025,7 +2038,7 @@ msgstr "Fick en ensam huvudrad p� %u tecken" #: methods/http.cc:531 msgid "Bad header line" -msgstr "Trasig huvudrad" +msgstr "Felaktig huvudrad" #: methods/http.cc:550 methods/http.cc:557 msgid "The HTTP server sent an invalid reply header" @@ -2041,7 +2054,7 @@ msgstr "Http-servern s�nde ett ogiltigt Content-Range-huvud" #: methods/http.cc:603 msgid "This HTTP server has broken range support" -msgstr "Denna http-servers st�d f�r delvis h�mtning fungerar inte" +msgstr "Den h�r http-serverns st�d f�r delvis h�mtning fungerar inte" #: methods/http.cc:627 msgid "Unknown date format" @@ -2053,7 +2066,7 @@ msgstr "\"Select\" misslyckades" #: methods/http.cc:779 msgid "Connection timed out" -msgstr "Tidsgr�nsen f�r anslutningen n�ddes" +msgstr "Anslutningen �verskred tidsgr�nsen" #: methods/http.cc:802 msgid "Error writing to output file" @@ -2077,11 +2090,11 @@ msgstr "Fel vid l�sning fr�n server" #: methods/http.cc:1108 msgid "Bad header data" -msgstr "Trasigt data i huvud" +msgstr "Felaktig data i huvud" #: methods/http.cc:1125 msgid "Connection failed" -msgstr "Anslutning misslyckades" +msgstr "Anslutningen misslyckades" #: methods/http.cc:1216 msgid "Internal error" @@ -2099,7 +2112,7 @@ msgstr "Kunde inte utf�ra mmap p� %lu byte" #: apt-pkg/contrib/strutl.cc:978 #, c-format msgid "Selection %s not found" -msgstr "Valet %s ej funnet" +msgstr "Valet %s hittades inte" #: apt-pkg/contrib/configuration.cc:434 #, c-format @@ -2109,12 +2122,19 @@ msgstr "Ok�nd typf�rkortning: \"%c\"" #: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" -msgstr "�ppnar konfigurationsfil %s" +msgstr "�ppnar konfigurationsfilen %s" +<<<<<<< TREE #: apt-pkg/contrib/configuration.cc:510 #, fuzzy, c-format msgid "Line %d too long (max %lu)" msgstr "Rad %d f�r l�ng (max %d)" +======= +#: apt-pkg/contrib/configuration.cc:510 +#, c-format +msgid "Line %d too long (max %lu)" +msgstr "Rad %d �r f�r l�ng (max %lu)" +>>>>>>> MERGE-SOURCE #: apt-pkg/contrib/configuration.cc:606 #, c-format @@ -2149,7 +2169,7 @@ msgstr "Syntaxfel %s:%u: Inkluderad h�rifr�n" #: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Syntaxfel %s:%u: Direktivet \"%s\" st�ds ej" +msgstr "Syntaxfel %s:%u: Direktivet \"%s\" st�ds inte" #: apt-pkg/contrib/configuration.cc:736 #, c-format @@ -2169,7 +2189,7 @@ msgstr "%c%s... F�rdig" #: apt-pkg/contrib/cmndline.cc:77 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Kommandoradsflagga \"%c\" [fr�n %s] �r ej k�nd." +msgstr "Kommandoradsflaggan \"%c\" [fr�n %s] �r inte k�nd." #: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 #: apt-pkg/contrib/cmndline.cc:119 @@ -2185,17 +2205,17 @@ msgstr "Kommandoradsflaggan %s �r inte boolsk" #: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 #, c-format msgid "Option %s requires an argument." -msgstr "Flaggan %s kr�ver ett v�rde." +msgstr "Flaggan %s kr�ver ett argument." #: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." -msgstr "Flagga %s: Den angivna konfigurationsposten m�ste inneh�lla =<v�rde>." +msgstr "Flagga %s: Den angivna konfigurationsposten m�ste inneh�lla ett =<v�rde>." #: apt-pkg/contrib/cmndline.cc:234 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Flaggan %s kr�ver ett heltalsv�rde, inte \"%s\"" +msgstr "Flaggan %s kr�ver ett heltalsargument, inte \"%s\"" #: apt-pkg/contrib/cmndline.cc:265 #, c-format @@ -2205,7 +2225,7 @@ msgstr "Flaggan \"%s\" �r f�r l�ng" #: apt-pkg/contrib/cmndline.cc:298 #, c-format msgid "Sense %s is not understood, try true or false." -msgstr "F�rst�r ej %s, f�rs�k med \"true\" eller \"false\"." +msgstr "F�rst�r inte %s, prova med \"true\" eller \"false\"." #: apt-pkg/contrib/cmndline.cc:348 #, c-format @@ -2215,13 +2235,13 @@ msgstr "Felaktig operation %s" #: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" -msgstr "Kunde inte ta status p� monteringspunkt %s." +msgstr "Kunde inte ta status p� monteringspunkten %s." # Felmeddelande f�r misslyckad chdir #: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 #, c-format msgid "Unable to change to %s" -msgstr "Kunde inte g� till %s" +msgstr "Kunde inte byta till %s" #: apt-pkg/contrib/cdromutl.cc:187 msgid "Failed to stat the cdrom" @@ -2230,7 +2250,7 @@ msgstr "Kunde inte ta status p� cd-romen." #: apt-pkg/contrib/fileutl.cc:80 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "Anv�nder inte l�sning f�r skrivskyddad l�sfil %s" +msgstr "Anv�nder inte l�sning f�r skrivskyddade l�sfilen %s" #: apt-pkg/contrib/fileutl.cc:85 #, c-format @@ -2240,7 +2260,7 @@ msgstr "Kunde inte �ppna l�sfilen %s" #: apt-pkg/contrib/fileutl.cc:103 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Anv�nder inte l�sning f�r nfs-monterad l�sfil %s" +msgstr "Anv�nder inte l�sning f�r nfs-monterade l�sfilen %s" #: apt-pkg/contrib/fileutl.cc:107 #, c-format @@ -2250,7 +2270,7 @@ msgstr "Kunde inte erh�lla l�set %s" #: apt-pkg/contrib/fileutl.cc:375 #, c-format msgid "Waited for %s but it wasn't there" -msgstr "V�ntade, p� %s men den fanns inte d�r" +msgstr "V�ntade p� %s men den fanns inte d�r" #: apt-pkg/contrib/fileutl.cc:385 #, c-format @@ -2260,12 +2280,12 @@ msgstr "Underprocessen %s r�kade ut f�r ett segmenteringsfel." #: apt-pkg/contrib/fileutl.cc:388 #, c-format msgid "Sub-process %s returned an error code (%u)" -msgstr "Underprocessen %s returnerade en felkod (%u)" +msgstr "Underprocessen %s svarade med en felkod (%u)" #: apt-pkg/contrib/fileutl.cc:390 #, c-format msgid "Sub-process %s exited unexpectedly" -msgstr "Underprocessen %s avslutade ov�ntat" +msgstr "Underprocessen %s avslutades ov�ntat" #: apt-pkg/contrib/fileutl.cc:434 #, c-format @@ -2275,16 +2295,16 @@ msgstr "Kunde inte �ppna filen %s" #: apt-pkg/contrib/fileutl.cc:490 #, c-format msgid "read, still have %lu to read but none left" -msgstr "l�sning, har fortfarande %lu att l�sa men inget �r kvar" +msgstr "l�sning, har fortfarande %lu att l�sa men ingenting finns kvar" #: apt-pkg/contrib/fileutl.cc:520 #, c-format msgid "write, still have %lu to write but couldn't" -msgstr "skrivning, har fortfarande %lu att skriva men kunde ej" +msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" #: apt-pkg/contrib/fileutl.cc:595 msgid "Problem closing the file" -msgstr "Problem med att st�nga filens" +msgstr "Problem med att st�nga filen" #: apt-pkg/contrib/fileutl.cc:601 msgid "Problem unlinking the file" @@ -2292,7 +2312,7 @@ msgstr "Problem med att l�nka ut filen" #: apt-pkg/contrib/fileutl.cc:612 msgid "Problem syncing the file" -msgstr "Problem med att synka filen" +msgstr "Problem med att synkronisera filen" # Felmeddelande #: apt-pkg/pkgcache.cc:132 @@ -2301,7 +2321,7 @@ msgstr "Paketcachen �r tom" #: apt-pkg/pkgcache.cc:138 msgid "The package cache file is corrupted" -msgstr "Paketcachefilen �r trasig" +msgstr "Paketcachefilen �r skadad" #: apt-pkg/pkgcache.cc:143 msgid "The package cache file is an incompatible version" @@ -2310,7 +2330,7 @@ msgstr "Paketcachefilens version �r inkompatibel" #: apt-pkg/pkgcache.cc:148 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Denna APT st�der inte versionssystemet \"%s\"" +msgstr "Denna APT saknar st�d f�r versionssystemet \"%s\"" #: apt-pkg/pkgcache.cc:153 msgid "The package cache was built for a different architecture" @@ -2318,11 +2338,11 @@ msgstr "Paketcachen byggdes f�r en annan arkitektur" #: apt-pkg/pkgcache.cc:224 msgid "Depends" -msgstr "Beror" +msgstr "Beroende av" #: apt-pkg/pkgcache.cc:224 msgid "PreDepends" -msgstr "Beror i f�rv�g" +msgstr "F�rberoende av" #: apt-pkg/pkgcache.cc:224 msgid "Suggests" @@ -2335,7 +2355,7 @@ msgstr "Rekommenderar" # "Konfliktar"? #: apt-pkg/pkgcache.cc:225 msgid "Conflicts" -msgstr "I konflikt med" +msgstr "St�r i konflikt med" #: apt-pkg/pkgcache.cc:225 msgid "Replaces" @@ -2344,11 +2364,11 @@ msgstr "Ers�tter" # "F�r�ldrar"? #: apt-pkg/pkgcache.cc:226 msgid "Obsoletes" -msgstr "G�r f�r�ldrad" +msgstr "F�r�ldrar" #: apt-pkg/pkgcache.cc:226 msgid "Breaks" -msgstr "" +msgstr "Trasar s�nder" #: apt-pkg/pkgcache.cc:237 msgid "important" @@ -2356,7 +2376,7 @@ msgstr "viktigt" #: apt-pkg/pkgcache.cc:237 msgid "required" -msgstr "kr�vt" +msgstr "n�dv�ndigt" #: apt-pkg/pkgcache.cc:237 msgid "standard" @@ -2383,19 +2403,18 @@ msgid "Dependency generation" msgstr "Beroendegenerering" #: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174 -#, fuzzy msgid "Reading state information" -msgstr "L�gger in tillg�nglighetsinformation" +msgstr "L�ser tillst�ndsinformation" #: apt-pkg/depcache.cc:198 -#, fuzzy, c-format +#, c-format msgid "Failed to open StateFile %s" -msgstr "Misslyckades med att �ppna %s" +msgstr "Misslyckades med att �ppna StateFile %s" #: apt-pkg/depcache.cc:204 -#, fuzzy, c-format +#, c-format msgid "Failed to write temporary StateFile %s" -msgstr "Misslyckades med att skriva filen %s" +msgstr "Misslyckades med att skriva tempor�r StateFile %s" #: apt-pkg/tagfile.cc:102 #, c-format @@ -2410,7 +2429,7 @@ msgstr "Kunde inte tolka paketfilen %s (2)" #: apt-pkg/sourcelist.cc:90 #, c-format msgid "Malformed line %lu in source list %s (URI)" -msgstr "Rad %lu i k�llistan %s har fel format (URI)" +msgstr "Rad %lu i k�llistan %s har (URI)" #: apt-pkg/sourcelist.cc:92 #, c-format @@ -2440,7 +2459,7 @@ msgstr "�ppnar %s" #: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 #, c-format msgid "Line %u too long in source list %s." -msgstr "Rad %u f�r l�ng i k�llistan %s." +msgstr "Rad %u �r f�r l�ng i k�llistan %s." #: apt-pkg/sourcelist.cc:236 #, c-format @@ -2450,7 +2469,7 @@ msgstr "Rad %u i k�llistan %s har fel format (typ)" #: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Typ \"%s\" �r ok�nd p� rad %u i listan �ver k�llor %s" +msgstr "Typ \"%s\" �r inte k�nd p� rad %u i listan �ver k�llor %s" #: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format @@ -2464,7 +2483,7 @@ msgid "" "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -"F�r att genomf�ra denna installation m�ste det systemkritiska paketet %s " +"F�r att genomf�ra installationen m�ste det systemkritiska paketet %s " "tillf�lligt tas bort p� grund av en beroendespiral i Conflicts/Pre-Depends. " "Detta �r oftast en d�lig id�, men om du verkligen vill g�ra det kan du " "aktivera flaggan \"APT::Force-LoopBreak\"." @@ -2487,11 +2506,11 @@ msgid "" "held packages." msgstr "" "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero p� " -"h�llna paket." +"tillbakah�llna paket." #: apt-pkg/algorithms.cc:1105 msgid "Unable to correct problems, you have held broken packages." -msgstr "Kunde inte korrigera problemen, du har h�llt trasiga paket." +msgstr "Kunde inte korrigera problemen, du har h�llt tillbaka trasiga paket." #: apt-pkg/acquire.cc:59 #, c-format @@ -2528,7 +2547,7 @@ msgstr "Metoden %s startade inte korrekt" #: apt-pkg/acquire-worker.cc:381 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck Enter." +msgstr "Mata in skivan med etiketten \"%s\" i enheten \"%s\" och tryck p� Enter." #: apt-pkg/init.cc:126 #, c-format @@ -2538,7 +2557,7 @@ msgstr "Paketsystemet \"%s\" st�ds inte" # #: apt-pkg/init.cc:142 msgid "Unable to determine a suitable packaging system type" -msgstr "Kunde inte avg�ra en l�mpligt paketsystemstyp" +msgstr "Kunde inte fastst�lla en l�mpligt paketsystemstyp" #: apt-pkg/clean.cc:57 #, c-format @@ -2557,10 +2576,10 @@ msgstr "Paketlistan eller statusfilen kunde inte tolkas eller �ppnas." msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan m�jligen r�tta till problemet genom att k�ra \"apt-get update\"" -# "Package" �r en str�ng i inst�llningsfilen +# "Package" �r en str�ng i konfigurationsfilen #: apt-pkg/policy.cc:267 msgid "Invalid record in the preferences file, no Package header" -msgstr "Ogiltig post i inst�llningsfilen, \"Package\"-huvud saknas" +msgstr "Ogiltig post i konfigurationsfilen, \"Package\"-huvud saknas" #: apt-pkg/policy.cc:289 #, c-format @@ -2587,9 +2606,15 @@ msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fel uppstod vid hantering av %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:153 +<<<<<<< TREE #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" +======= +#, c-format +msgid "Error occurred while processing %s (NewFileDesc1)" +msgstr "Fel uppstod vid hantering av %s (NewFileDesc1)" +>>>>>>> MERGE-SOURCE #: apt-pkg/pkgcachegen.cc:178 #, c-format @@ -2617,26 +2642,31 @@ msgid "Error occurred while processing %s (NewVersion2)" msgstr "Fel uppstod vid hantering av %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:245 +<<<<<<< TREE #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" +======= +#, c-format +msgid "Error occurred while processing %s (NewFileDesc2)" +msgstr "Fel uppstod vid hantering av %s (NewFileDesc2)" +>>>>>>> MERGE-SOURCE #: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "Grattis, du �verskred antalet paketnamn denna APT kan hantera." +msgstr "Grattis, du �verskred antalet paketnamn som denna APT kan hantera." #: apt-pkg/pkgcachegen.cc:254 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Grattis, du �verskred antalet versioner denna APT kan hantera." +msgstr "Grattis, du �verskred antalet versioner som denna APT kan hantera." #: apt-pkg/pkgcachegen.cc:257 -#, fuzzy msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Grattis, du �verskred antalet versioner denna APT kan hantera." +msgstr "Grattis, du �verskred antalet beskrivningar som denna APT kan hantera." #: apt-pkg/pkgcachegen.cc:260 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Grattis, du �verskred antalet beroenden denna APT kan hantera." +msgstr "Grattis, du �verskred antalet beroenden som denna APT kan hantera." # NewPackage etc. �r funktionsnamn #: apt-pkg/pkgcachegen.cc:288 @@ -2659,9 +2689,10 @@ msgstr "Paketet %s %s hittades inte n�r filberoenden hanterades" msgid "Couldn't stat source package list %s" msgstr "Kunde inte ta status p� k�llkodspaketlistan %s" +# B�ttre ord? #: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" -msgstr "Samlar filberoenden" +msgstr "Samlar filtillhandah�llningar" #: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" @@ -2675,11 +2706,11 @@ msgstr "namnbyte misslyckades, %s (%s -> %s)." #: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661 #: apt-pkg/acquire-item.cc:1411 msgid "MD5Sum mismatch" -msgstr "MD5-kontrollsumma st�mmer inte" +msgstr "MD5-kontrollsumman st�mmer inte" #: apt-pkg/acquire-item.cc:1106 msgid "There is no public key available for the following key IDs:\n" -msgstr "Det finns ingen publik nyckel tillg�nglig f�r f�ljande nyckel-id:n:\n" +msgstr "Det finns ingen �ppen nyckel tillg�nglig f�r f�ljande nyckel-id:n:\n" #: apt-pkg/acquire-item.cc:1219 #, c-format @@ -2687,7 +2718,7 @@ msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " "to manually fix this package. (due to missing arch)" msgstr "" -"Jag kunde inte lokalisera n�gon fil f�r paketet %s. Detta kan betyda att du " +"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:1278 @@ -2696,14 +2727,14 @@ msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -"Jag kunde inte lokalisera n�gon fil f�r paketet %s. Detta kan betyda att du " +"Jag kunde inte hitta n�gon fil f�r paketet %s. Detta kan betyda att du " "manuellt m�ste reparera detta paket." #: apt-pkg/acquire-item.cc:1314 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." -msgstr "Paketindexfilerna �r trasiga. Inget \"Filename:\"-f�lt f�r paketet %s." +msgstr "Paketindexfilerna �r skadede. Inget \"Filename:\"-f�lt f�r paketet %s." #: apt-pkg/acquire-item.cc:1401 msgid "Size mismatch" @@ -2712,7 +2743,7 @@ msgstr "Storleken st�mmer inte" #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" -msgstr "Leverant�rsblock %s saknar fingeravtryck" +msgstr "Leverant�rsblocket %s saknar fingeravtryck" #: apt-pkg/cdrom.cc:529 #, c-format @@ -2720,7 +2751,7 @@ msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Anv�nder cd-rom-monteringspunkt %s\n" +"Anv�nder cd-rom-monteringspunkten %s\n" "Monterar cd-rom\n" #: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620 @@ -2730,12 +2761,12 @@ msgstr "Identifierar.. " #: apt-pkg/cdrom.cc:563 #, c-format msgid "Stored label: %s \n" -msgstr "Etikett: %s \n" +msgstr "Lagrad etikett: %s \n" #: apt-pkg/cdrom.cc:583 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Anv�nder cd-rom-monteringspunkt %s\n" +msgstr "Anv�nder cd-rom-monteringspunkten %s\n" #: apt-pkg/cdrom.cc:601 msgid "Unmounting CD-ROM\n" @@ -2752,19 +2783,21 @@ msgstr "Monterar cd-rom...\n" #: apt-pkg/cdrom.cc:631 msgid "Scanning disc for index files..\n" -msgstr "S�ker efter indexfiler p� disken...\n" +msgstr "S�ker efter indexfiler p� skivan...\n" #: apt-pkg/cdrom.cc:671 -#, fuzzy, c-format +#, -format msgid "" "Found %i package indexes, %i source indexes, %i translation indexes and %i " "signatures\n" -msgstr "Hittade %i paketindex, %i k�llkodsindex och %i signaturer\n" +msgstr "" +"Hittade %i paketindex, %i k�llkodsindex, %i �vers�ttningsindex och %i " +"signaturer\n" #: apt-pkg/cdrom.cc:708 -#, fuzzy, c-format +#, c-format msgid "Found label '%s'\n" -msgstr "Etikett: %s \n" +msgstr "Hittade etiketten \"%s\"\n" #: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" @@ -2792,9 +2825,8 @@ msgid "Source list entries for this disc are:\n" msgstr "Poster i k�llistan f�r denna skiva:\n" #: apt-pkg/cdrom.cc:834 -#, fuzzy msgid "Unmounting CD-ROM...\n" -msgstr "Avmonterar cd-rom..." +msgstr "Avmonterar cd-rom...\n" #: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format @@ -2844,7 +2876,7 @@ msgstr "Installerade %s" #: apt-pkg/deb/dpkgpm.cc:368 #, c-format msgid "Preparing for removal of %s" -msgstr "F�rbereder f�r borttagning av %s" +msgstr "F�rbereder borttagning av %s" #: apt-pkg/deb/dpkgpm.cc:369 #, c-format @@ -2859,7 +2891,7 @@ msgstr "Tog bort %s" #: apt-pkg/deb/dpkgpm.cc:375 #, c-format msgid "Preparing to completely remove %s" -msgstr "F�rbereder att ta bort hela %s" +msgstr "F�rbereder borttagning av hela %s" #: apt-pkg/deb/dpkgpm.cc:376 #, c-format @@ -2872,7 +2904,7 @@ msgstr "Kunde inte l�gga p� programfix p� filen" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "F�rbindelsen st�ngdes i f�rtid" +msgstr "Anslutningen st�ngdes i f�rtid" # Felmeddelande f�r misslyckad chdir #~ msgid "File date has changed %s" |