* merged from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main

diff --cc debian/changelog
index 1cafdaa,0c31db6..04378ea
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,15 +1,21 @@@
 -apt (0.6.44.2) unstable; urgency=low
 +apt (0.6.45) unstable; urgency=low
  
 -  * apt-pkg/depcache.cc:
 -    - added Debug::pkgDepCache::AutoInstall (thanks to infinity)
 -  * merged from 
 -    http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
 -      * sk.po: Completed to 512t
 -      * eu.po: Completed to 512t
 -      * fr.po: Completed to 512t
 -      * sv.po: Completed to 512t
 -      * Update all PO and the POT. Gives 506t6f for formerly
 -        complete translations
 +  * apt-pkg/contrib/sha256.cc:
 +    - fixed the sha256 generation (closes: #378183)
 +  * ftparchive/cachedb.cc:
 +    - applied patch from ajt to fix Clean() function
 +      (closes: #379576)
++  * Merged from Christian Perrier bzr branch:
++    * ko.po: Updated to 512t. Closes: #378901
++    * hu.po: Updated to 512t. Closes: #376330
++    * km.po: New Khmer translation: 506t6f. Closes: #375068
++    * ne.po: New Nepali translation: 512t. Closes: #373729
++    * vi.po: Updated to 512t. Closes: #368038
++    * zh_TW.po: Remove an extra %s in one string. Closes: #370551
++    * dz.po: New Dzongkha translation: 512t
++    * ro.po: Updated to 512t
++    * eu.po: Updated
++    * eu.po: Updated
  
   --
  

diff --cc po/bg.po
index e515d6c,e515d6c..ddfac13
--- 1/po/bg.po
--- 2/po/bg.po
+++ b/po/bg.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.6\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-03-31 22:05+0300\n"
  "Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
  "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@@ -2306,15 -2306,15 +2306,15 @@@ msgstr "незадължителен
  msgid "extra"
  msgstr "допълнителен"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Изграждане на дървото със зависимости"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Версии кандидати"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Генериране на зависимости"
  

diff --cc po/bs.po
index 2fe2d7c,2fe2d7c..fef208b
--- 1/po/bs.po
--- 2/po/bs.po
+++ b/po/bs.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.26\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2004-05-06 15:25+0100\n"
  "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
  "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@@ -2109,15 -2109,15 +2109,15 @@@ msgstr "opcionalno
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Gradim stablo zavisnosti"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Verzije kandidata"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Stvaranje zavisnosti"
  

diff --cc po/ca.po
index b631099,b631099..33b266d
--- 1/po/ca.po
--- 2/po/ca.po
+++ b/po/ca.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.6\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-02-05 22:00+0100\n"
  "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
  "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@@ -2298,15 -2298,15 +2298,15 @@@ msgstr "opcional
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "S'està construint l'arbre de dependències"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Versions candidates"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Dependències que genera"
  

diff --cc po/cs.po
index 837f780,837f780..50a2db1
--- 1/po/cs.po
--- 2/po/cs.po
+++ b/po/cs.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-08 11:02+0200\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-05-14 18:36+0200\n"
  "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
  "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@@ -2269,15 -2269,15 +2269,15 @@@ msgstr "volitelný
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Vytvářím strom závislostí"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Kandidátské verze"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Generování závislostí"
  

diff --cc po/cy.po
index 18612e6,18612e6..faffe1a
--- 1/po/cy.po
--- 2/po/cy.po
+++ b/po/cy.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: APT\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2005-06-06 13:46+0100\n"
  "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
  "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@@ -2363,17 -2363,17 +2363,17 @@@ msgstr "opsiynnol
  msgid "extra"
  msgstr "ychwanegol"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  #, fuzzy
  msgid "Building dependency tree"
  msgstr "Yn Aideladu Coeden Dibyniaeth"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  #, fuzzy
  msgid "Candidate versions"
  msgstr "Fersiynau Posib"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  #, fuzzy
  msgid "Dependency generation"
  msgstr "Cynhyrchaid Dibyniaeth"

diff --cc po/da.po
index 1ca325c,1ca325c..434c4b3
--- 1/po/da.po
--- 2/po/da.po
+++ b/po/da.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt-da\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-01-20 22:23+0100\n"
  "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
  "Language-Team: Danish <dansk@klid.dk>\n"
@@@ -2283,15 -2283,15 +2283,15 @@@ msgstr "frivillig
  msgid "extra"
  msgstr "ekstra"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Opbygger afhængighedstræ"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Kandidatversioner"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Afhængighedsgenerering"
  

diff --cc po/de.po
index cadfefe,cadfefe..9358ff2
--- 1/po/de.po
--- 2/po/de.po
+++ b/po/de.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.26\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2005-06-15 18:22+0200\n"
  "Last-Translator: Michael Piefel <piefel@debian.org>\n"
  "Language-Team:  <de@li.org>\n"
@@@ -2322,15 -2322,15 +2322,15 @@@ msgstr "optional
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Abhängigkeitsbaum wird aufgebaut"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Mögliche Versionen"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Abhängigkeits-Generierung"
  

diff --cc po/el.po
index 7a88507,7a88507..51143d9
--- 1/po/el.po
--- 2/po/el.po
+++ b/po/el.po
@@@ -18,7 -18,7 +18,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt_po_el_new\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-01-18 15:16+0200\n"
  "Last-Translator: Konstantinos Margaritis <markos@debian.org>\n"
  "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@@ -2320,15 -2320,15 +2320,15 @@@ msgstr "προαιρετικό
  msgid "extra"
  msgstr "επιπλέον"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Κατασκευή Δένδρου Εξαρτήσεων"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Υποψήφιες Εκδόσεις"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Παραγωγή Εξαρτήσεων"
  

diff --cc po/en_GB.po
index 0cc9ad7,0cc9ad7..34d1bde
--- 1/po/en_GB.po
--- 2/po/en_GB.po
+++ b/po/en_GB.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.5\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2002-11-10 20:56+0100\n"
  "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
  "Language-Team: en_GB <en@li.org>\n"
@@@ -2272,15 -2272,15 +2272,15 @@@ msgstr "optional
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Building dependency tree"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Candidate versions"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Dependency generation"
  

diff --cc po/es.po
index ebb2922,ebb2922..c8c1e52
--- 1/po/es.po
--- 2/po/es.po
+++ b/po/es.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.6.42.3exp1\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2005-11-16 17:37+0100\n"
  "Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n"
  "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@@ -2307,15 -2307,15 +2307,15 @@@ msgstr "opcional
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Creando árbol de dependencias"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Versiones candidatas"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Generación de dependencias"
  

diff --cc po/fi.po
index 806b2a9,806b2a9..09e1926
--- 1/po/fi.po
--- 2/po/fi.po
+++ b/po/fi.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.26\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2005-02-15 14:09+0200\n"
  "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
  "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@@ -2285,15 -2285,15 +2285,15 @@@ msgstr "valinnainen
  msgid "extra"
  msgstr "ylimääräinen"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Muodostetaan riippuvuussuhteiden puu"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Mahdolliset versiot"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Luodaan riippuvuudet"
  

diff --cc po/fr.po
index 22d83c0,22d83c0..b9899ab
--- 1/po/fr.po
--- 2/po/fr.po
+++ b/po/fr.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: fr\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-05-18 09:31-0500\n"
  "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
  "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@@ -2327,15 -2327,15 +2327,15 @@@ msgstr "optionnel
  msgid "extra"
  msgstr "supplémentaire"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Construction de l'arbre des dépendances"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Versions possibles"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Génération des dépendances"
  

diff --cc po/gl.po
index a288bd8,a288bd8..cc522e5
--- 1/po/gl.po
--- 2/po/gl.po
+++ b/po/gl.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-05-11 18:09+0200\n"
  "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n"
  "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@@ -15,7 -15,7 +15,7 @@@
  "Content-Transfer-Encoding: 8bit\n"
  
  #: cmdline/apt-cache.cc:135
--#, c-format 
++#, c-format
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "O paquete %s versión %s ten unha dependencia incumprida:\n"
  
@@@ -2297,15 -2297,15 +2297,15 @@@ msgstr "opcional
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "A construír a árbore de dependencias"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Versións candidatas"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Xeración de dependencias"
  

diff --cc po/hu.po
index 867c75e,d7a6c7c..fdc39ab
--- 1/po/hu.po
--- 2/po/hu.po
+++ b/po/hu.po
@@@ -400,11 -415,9 +401,11 @@@ msgstr "
  "\n"
  "A 'packages' és 'sources' parancsokat a fa gyökeréből kell futtatni.\n"
  "A BinaryPath-nak a rekurzív keresés kiindulópontjára kell mutatni és\n"
 -"a felülbírálófájlnak a felülbíráló jelzőket kell tartalmaznia. Az útvonal-előtag\n"
 -"hozzáadódik a fájlnév mezőkhöz, ha meg van adva. Felhasználására egy példa a\n"
 +"a felülbírálófájlnak a felülbíráló jelzőket kell tartalmaznia. Az útvonal-"
 +"előtag\n"
 +"hozzáadódik a fájlnév mezőkhöz, ha meg van adva. Felhasználására egy példa "
 +"a\n"
- "debian archívumból:\n"
+ "Debian archívumból:\n"
  "   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
  "               dists/potato/main/binary-i386/Packages\n"
  "\n"
@@@ -1162,12 -1190,8 +1163,12 @@@ msgstr "
  
  #: cmdline/apt-get.cc:2264
  #, c-format
 -msgid "%s dependency for %s cannot be satisfied because no available versions of package %s can satisfy version requirements"
 -msgstr "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a verzió-követelményt kielégítő elérhető verziója."
 +msgid ""
 +"%s dependency for %s cannot be satisfied because no available versions of "
 +"package %s can satisfy version requirements"
 +msgstr ""
 +"%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a "
- "verziókövetelményt kielégítő elérhető verziója."
++"verzió-követelményt kielégítő elérhető verziója."
  
  #: cmdline/apt-get.cc:2299
  #, c-format
@@@ -1526,11 -1563,13 +1527,11 @@@ msgstr "%sinfo nem érhető el
  
  #: apt-inst/deb/dpkgdb.cc:123
  msgid "The info and temp directories need to be on the same filesystem"
- msgstr "Az info és temp könyvtáraknak ugyanazon a fájlrendszeren kell lenniük"
+ msgstr "Az info és temp könyvtáraknak egy fájlrendszeren kell lenniük"
  
  #. Build the status cache
 -#: apt-inst/deb/dpkgdb.cc:139
 -#: apt-pkg/pkgcachegen.cc:643
 -#: apt-pkg/pkgcachegen.cc:712
 -#: apt-pkg/pkgcachegen.cc:717
 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
 +#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
  #: apt-pkg/pkgcachegen.cc:840
  msgid "Reading package lists"
  msgstr "Csomaglisták olvasása"
@@@ -1891,9 -1943,8 +1892,9 @@@ msgid "E: Argument list from Acquire::g
  msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek."
  
  #: methods/gpgv.cc:198
 -msgid "Internal error: Good signature, but could not determine key fingerprint?!"
 +msgid ""
 +"Internal error: Good signature, but could not determine key fingerprint?!"
- msgstr ""
+ msgstr "Belső hiba: Jó aláírás, de meghatározhatatlan kulcs ujjlenyomat?!"
  
  #: methods/gpgv.cc:203
  msgid "At least one invalid signature was encountered."
@@@ -2279,7 -2333,8 +2280,7 @@@ msgstr "opcionális
  msgid "extra"
  msgstr "extra"
  
- #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
 -#: apt-pkg/depcache.cc:61
 -#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Függőségi fa építése"
  

diff --cc po/it.po
index 08476e8,08476e8..2a0e621
--- 1/po/it.po
--- 2/po/it.po
+++ b/po/it.po
@@@ -5,7 -5,7 +5,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.5\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-02-14 11:41+0100\n"
  "Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n"
  "Language-Team: Italian <it@li.org>\n"
@@@ -2309,15 -2309,15 +2309,15 @@@ msgstr "opzionale
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Generazione dell'albero delle dipendenze in corso"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Versioni candidate"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Generazione delle dipendenze"
  

diff --cc po/ja.po
index f1b55b0,f1b55b0..db78e7b
--- 1/po/ja.po
--- 2/po/ja.po
+++ b/po/ja.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.6\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-01-25 20:55+0900\n"
  "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
  "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@@ -2289,15 -2289,15 +2289,15 @@@ msgstr "任意
  msgid "extra"
  msgstr "特別"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "依存関係ツリーを作成しています"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "候補バージョン"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "依存関係の生成"
  

diff --cc po/ko.po
index 37648f7,e417f25..4617fc2
--- 1/po/ko.po
--- 2/po/ko.po
+++ b/po/ko.po
@@@ -795,11 -823,12 +790,10 @@@ msgid "Packages need to be removed but 
  msgstr "꾸러미를 지워야 하지만 지우기가 금지되어 있습니다."
  
  #: cmdline/apt-get.cc:775
- #, fuzzy
  msgid "Internal error, Ordering didn't finish"
- msgstr "diversion을 추가하는 데 내부 오류"
+ msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다"
  
 -#: cmdline/apt-get.cc:791
 -#: cmdline/apt-get.cc:1800
 -#: cmdline/apt-get.cc:1833
 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
  msgid "Unable to lock the download directory"
  msgstr "내려받기 디렉토리를 잠글 수 없습니다"
  
@@@ -810,7 -841,7 +804,9 @@@ msgstr "소스 목록을 읽을 수 없
  
  #: cmdline/apt-get.cc:816
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 -msgstr "이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십시오."
 +msgstr ""
++"이상하게도 크기가 서로 다릅니다. apt@packages.debian.org로 이메일을 보내주십"
++"시오."
  
  #: cmdline/apt-get.cc:821
  #, c-format
@@@ -832,23 -863,23 +828,23 @@@ msgstr "ì\95\95ì¶\95ì\9d\84 í\92\80ë©´ %së°\94ì\9d´í\8a¸ì\9d
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "압축을 풀면 %s바이트의 디스크 공간이 비워집니다.\n"
  
 -#: cmdline/apt-get.cc:846
 -#: cmdline/apt-get.cc:1971
 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
- #, fuzzy, c-format
+ #, c-format
  msgid "Couldn't determine free space in %s"
- msgstr "%sì\97\90 충ë¶\84í\95\9c ê³µê°\84ì\9d´ 없습니다"
+ msgstr "%sì\9d\98 ì\97¬ì\9c  ê³µê°\84ì\9d\98 í\81¬ê¸°ë¥¼ í\8c\8cì\95\85í\95  ì\88\98 없습니다"
  
  #: cmdline/apt-get.cc:849
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr "%s 안에 충분한 여유 공간이 없습니다."
  
 -#: cmdline/apt-get.cc:864
 -#: cmdline/apt-get.cc:884
 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
  msgid "Trivial Only specified but this is not a trivial operation."
 -msgstr "사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 아닙니다."
 +msgstr ""
 +"사소한 작업만 가능하도록(Trivial Only) 지정되었지만 이 작업은 사소한 작업이 "
 +"아닙니다."
  
- # 입력을 받아야 한다.  한글 입력을 못 할 수 있으므로 원문 그대로 사용.\r
+ # 입력을 받아야 한다.  한글 입력을 못 할 수 있으므로 원문 그대로 사용.
  #: cmdline/apt-get.cc:866
  msgid "Yes, do as I say!"
  msgstr "Yes, do as I say!"
@@@ -1013,14 -1040,10 +1009,14 @@@ msgstr "주의, 정규식 '%2$s'에 대
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:"
  
- # FIXME: specify a solution?  무슨 솔루션?\r
+ # FIXME: specify a solution?  무슨 솔루션?
  #: cmdline/apt-get.cc:1549
 -msgid "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)."
 -msgstr "의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 (아니면 해결 방법을 지정하십시오)."
 +msgid ""
 +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 +"solution)."
 +msgstr ""
 +"의존성이 맞지 않습니다. 꾸러미 없이 'apt-get -f install'을 시도해 보십시오 "
 +"(아니면 해결 방법을 지정하십시오)."
  
  #: cmdline/apt-get.cc:1561
  msgid ""
@@@ -1074,10 -1099,10 +1070,9 @@@ msgstr "실패
  msgid "Done"
  msgstr "완료"
  
 -#: cmdline/apt-get.cc:1768
 -#: cmdline/apt-get.cc:1776
 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
- #, fuzzy
  msgid "Internal error, problem resolver broke stuff"
- msgstr "내부 오류, AllUpgrade때문에 망가졌습니다"
+ msgstr "내부 오류, 문제 해결 프로그램이 사고쳤습니다"
  
  #: cmdline/apt-get.cc:1876
  msgid "Must specify at least one package to fetch source for"
@@@ -1446,8 -1465,10 +1441,8 @@@ msgstr "전환된 파일을 두 번 추
  msgid "Duplicate conf file %s/%s"
  msgstr "%s/%s 설정 파일이 중복되었습니다"
  
 -#: apt-inst/dirstream.cc:45
 -#: apt-inst/dirstream.cc:50
 -#: apt-inst/dirstream.cc:53
 +#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
- #, fuzzy, c-format
+ #, c-format
  msgid "Failed to write file %s"
  msgstr "%s 파일을 쓰는 데 실패했습니다"
  
@@@ -1662,11 -1689,12 +1657,10 @@@ msgid "Unable to unmount the CD-ROM in 
  msgstr "%s 안의 CD-ROM을 마운트 해제할 수 없습니다. 사용 중일 것입니다."
  
  #: methods/cdrom.cc:169
- #, fuzzy
  msgid "Disk not found."
- msgstr "파일이 없습니다"
+ msgstr "디스크가 없습니다"
  
 -#: methods/cdrom.cc:177
 -#: methods/file.cc:79
 -#: methods/rsh.cc:264
 +#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
  msgid "File not found"
  msgstr "파일이 없습니다"
  
@@@ -1894,12 -1938,11 +1888,12 @@@ msgstr "í\82¤ë§\81ì\97\90 ì \91ê·¼í\95  ì\88\98 ì\97\86ì\8aµë
  
  #: methods/gpgv.cc:99
  msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
- msgstr ""
+ msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 종료하는 중."
  
  #: methods/gpgv.cc:198
 -msgid "Internal error: Good signature, but could not determine key fingerprint?!"
 +msgid ""
 +"Internal error: Good signature, but could not determine key fingerprint?!"
- msgstr ""
+ msgstr "내부 오류: 서명은 올바르지만 키 지문을 확인할 수 없습니다!"
  
  #: methods/gpgv.cc:203
  msgid "At least one invalid signature was encountered."
@@@ -1912,18 -1955,15 +1906,17 @@@ msgstr "서명을 인증하기 위한 '
  
  #: methods/gpgv.cc:212
  msgid "Unknown error executing gpgv"
- msgstr ""
+ msgstr "gpgv 실행 도중 알 수 없는 오류 발생"
  
  #: methods/gpgv.cc:243
- #, fuzzy
  msgid "The following signatures were invalid:\n"
- msgstr "다음 꾸러미를 더 설치할 것입니다:"
+ msgstr "다음 서명이 올바르지 않습니다:\n"
  
  #: methods/gpgv.cc:250
 -msgid "The following signatures couldn't be verified because the public key is not available:\n"
 +msgid ""
 +"The following signatures couldn't be verified because the public key is not "
 +"available:\n"
- msgstr ""
+ msgstr "다음 서명들은 공개키가 없기 때문에 인증할 수 없습니다:\n"
  
  #: methods/gzip.cc:57
  #, c-format
@@@ -2283,7 -2330,8 +2276,7 @@@ msgstr "옵션
  msgid "extra"
  msgstr "별도"
  
- #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
 -#: apt-pkg/depcache.cc:61
 -#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "의존성 트리를 만드는 중입니다"
  
@@@ -2346,11 -2395,12 +2339,11 @@@ msgid "Malformed line %u in source lis
  msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)"
  
  #: apt-pkg/sourcelist.cc:244
- #, fuzzy, c-format
+ #, c-format
  msgid "Type '%s' is not known on line %u in source list %s"
- msgstr "ì\86\8cì\8a¤ 리ì\8a¤í\8a¸ %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
+ msgstr "ì\86\8cì\8a¤ 목ë¡\9d %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다"
  
 -#: apt-pkg/sourcelist.cc:252
 -#: apt-pkg/sourcelist.cc:255
 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
  #, c-format
  msgid "Malformed line %u in source list %s (vendor id)"
  msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (벤더 ID)"
@@@ -2423,12 -2461,9 +2416,10 @@@ msgid "Method %s did not start correctl
  msgstr "설치 방법 %s이(가) 올바르게 시작하지 않았습니다"
  
  #: apt-pkg/acquire-worker.cc:377
- #, fuzzy, c-format
+ #, c-format
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 -msgstr "'%2$s' 드라이브에 '%1$s'로 표기된 디스크를 삽입하고 엔터를 눌러주십시오."
 +msgstr ""
- "미디어 바꾸기: '%2$s' 드라이브에 다음 레이블이 달린\n"
- "디스크를 넣고 enter를 누르십시오\n"
- " '%1$s'\n"
++"'%2$s' 드라이브에 '%1$s'로 표기된 디스크를 삽입하고 엔터를 눌러주십시오."
  
  #: apt-pkg/init.cc:120
  #, c-format

diff --cc po/nb.po
index 01c09f9,01c09f9..58b3c02
--- 1/po/nb.po
--- 2/po/nb.po
+++ b/po/nb.po
@@@ -19,7 -19,7 +19,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2005-02-09 10:45+0100\n"
  "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
  "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@@ -2304,15 -2304,15 +2304,15 @@@ msgstr "valgfri
  msgid "extra"
  msgstr "tillegg"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Skaper oversikt over avhengighetsforhold"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Versjons-kandidater"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Oppretter avhengighetsforhold"
  

diff --cc po/nl.po
index ef3c6ac,ef3c6ac..5d2632e
--- 1/po/nl.po
--- 2/po/nl.po
+++ b/po/nl.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2005-02-10 17:35+0100\n"
  "Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
  "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@@ -2322,15 -2322,15 +2322,15 @@@ msgstr "optioneel
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Boom van vereisten wordt opgebouwd"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Kandidaat-versies"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Generatie vereisten"
  

diff --cc po/nn.po
index 372f6be,372f6be..56aa980
--- 1/po/nn.po
--- 2/po/nn.po
+++ b/po/nn.po
@@@ -9,7 -9,7 +9,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt_nn\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2005-02-14 23:30+0100\n"
  "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
  "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@@ -2287,15 -2287,15 +2287,15 @@@ msgstr "valfri
  msgid "extra"
  msgstr "tillegg"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Byggjer kravtre"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Kandidatversjonar"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Genererer kravforhold"
  

diff --cc po/pl.po
index 5fa6838,5fa6838..8be562a
--- 1/po/pl.po
--- 2/po/pl.po
+++ b/po/pl.po
@@@ -6,7 -6,7 +6,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.5\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-01-23 15:32+0100\n"
  "Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
  "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@@ -2292,15 -2292,15 +2292,15 @@@ msgstr "opcjonalny
  msgid "extra"
  msgstr "dodatkowy"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Budowanie drzewa zale¿no¶ci"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Kandyduj±ce wersje"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Generowanie zale¿no¶ci"
  

diff --cc po/pt.po
index d638e9b,d638e9b..f7b1cb8
--- 1/po/pt.po
--- 2/po/pt.po
+++ b/po/pt.po
@@@ -5,7 -5,7 +5,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2005-03-07 22:20+0000\n"
  "Last-Translator: Rui Az. <astronomy@mail.pt>\n"
  "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@@ -2293,15 -2293,15 +2293,15 @@@ msgstr "opcional
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Construindo Árvore de Dependências"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Versões Candidatas"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Geração de Dependência"
  

diff --cc po/pt_BR.po
index 3a51c82,3a51c82..6a53d25
--- 1/po/pt_BR.po
--- 2/po/pt_BR.po
+++ b/po/pt_BR.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-02-11 17:57-0200\n"
  "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
  "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@@@ -2294,15 -2294,15 +2294,15 @@@ msgstr "opcional
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Construindo Árvore de Dependências"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Versões Candidatas"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Geração de Dependência"
  

diff --cc po/ro.po
index 9210b42,400df82..0222214
--- 1/po/ro.po
--- 2/po/ro.po
+++ b/po/ro.po
@@@ -1921,9 -1913,9 +1921,10 @@@ msgid "At least one invalid signature w
  msgstr "Cel puţin o semnătură invalidă a fost întâlnită."
  
  #: methods/gpgv.cc:207
- #, fuzzy, c-format
+ #, c-format
  msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
- msgstr " verificarea semnăturii (este instalat gnupg?)"
 -msgstr "Nu pot executa '%s' pentru verificarea semnăturii (este instalat gnupg?)"
++msgstr ""
++"Nu pot executa '%s' pentru verificarea semnăturii (este instalat gnupg?)"
  
  #: methods/gpgv.cc:212
  msgid "Unknown error executing gpgv"
@@@ -2772,15 -2752,4 +2773,3 @@@ msgstr "Şters complet %s
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Conexiune închisă prematur"
- 
- #~ msgid "Reading file list"
- #~ msgstr "Citirea listei de fişiere"
- 
- #~ msgid "Could not execute "
- #~ msgstr "Nu s-a putut executa "
- 
- #~ msgid "Preparing for remove with config %s"
- #~ msgstr "Se pregăteşte pentru ştergere inclusiv configurarea %s"
--
- #~ msgid "Removed with config %s"
- #~ msgstr "Şters inclusiv configurarea %s"

diff --cc po/ru.po
index 3883ce2,3883ce2..727b7f7
--- 1/po/ru.po
--- 2/po/ru.po
+++ b/po/ru.po
@@@ -12,7 -12,7 +12,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt_po_ru\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-01-21 14:55+0300\n"
  "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
  "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@@ -2326,15 -2326,15 +2326,15 @@@ msgstr "необязательный
  msgid "extra"
  msgstr "дополнительный"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Построение дерева зависимостей"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Версии-кандидаты"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Генерирование зависимостей"
  

diff --cc po/sk.po
index e1286b4,e1286b4..d4fe815
--- 1/po/sk.po
--- 2/po/sk.po
+++ b/po/sk.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-05-29 15:33+0200\n"
  "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n"
  "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@@ -2275,15 -2275,15 +2275,15 @@@ msgstr "voliteľný
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Vytvára sa strom závislostí"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Kandidátske verzie"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Generovanie závislostí"
  
@@@ -2732,4 -2732,4 +2732,3 @@@ msgstr "Balík '%s' je úplne odstráne
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr "Spojenie bolo predčasne ukončené"
--

diff --cc po/sl.po
index a8a458a,a8a458a..06ac46e
--- 1/po/sl.po
--- 2/po/sl.po
+++ b/po/sl.po
@@@ -4,7 -4,7 +4,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.5\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2005-02-16 22:18+0100\n"
  "Last-Translator: Jure Èuhalev <gandalf@owca.info>\n"
  "Language-Team: Slovenian <sl@li.org>\n"
@@@ -2278,15 -2278,15 +2278,15 @@@ msgstr "izbirno
  msgid "extra"
  msgstr "dodatno"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Gradnja drevesa odvisnosti"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Razlièice kandidatov"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Ustvarjanje odvisnosti"
  

diff --cc po/sv.po
index 7ab4104,7ab4104..5d347ab
--- 1/po/sv.po
--- 2/po/sv.po
+++ b/po/sv.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-08 11:02+0200\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-05-18 08:35+0100\n"
  "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
  "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@@ -20,12 -20,12 +20,8 @@@
  msgid "Package %s version %s has an unmet dep:\n"
  msgstr "Paket %s version %s har ett beroende som inte kan tillfredsställas:\n"
  
--#: cmdline/apt-cache.cc:175
--#: cmdline/apt-cache.cc:527
--#: cmdline/apt-cache.cc:615
--#: cmdline/apt-cache.cc:771
--#: cmdline/apt-cache.cc:989
--#: cmdline/apt-cache.cc:1357
++#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
++#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
  #: cmdline/apt-cache.cc:1508
  #, c-format
  msgid "Unable to locate package %s"
@@@ -87,8 -87,8 +83,7 @@@ msgstr "Totalt bortkastat utrymme: 
  msgid "Total space accounted for: "
  msgstr "Totalt utrymme som kan redogöras för: "
  
--#: cmdline/apt-cache.cc:446
--#: cmdline/apt-cache.cc:1189
++#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
  #, c-format
  msgid "Package file %s is out of sync."
  msgstr "Paketfilen %s är ur synk."
@@@ -105,8 -105,8 +100,7 @@@ msgstr "Inga paket funna
  msgid "Package files:"
  msgstr "\"Package\"-filer:"
  
--#: cmdline/apt-cache.cc:1469
--#: cmdline/apt-cache.cc:1555
++#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
  msgid "Cache is out of sync, can't x-ref a package file"
  msgstr "Cachen är ur synk, kan inte korsreferera en paketfil"
  
@@@ -121,8 -121,8 +115,7 @@@ msgstr "%4i %s\n
  msgid "Pinned packages:"
  msgstr "Fastnålade paket:"
  
--#: cmdline/apt-cache.cc:1494
--#: cmdline/apt-cache.cc:1535
++#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
  msgid "(not found)"
  msgstr "(ej funnen)"
  
@@@ -131,8 -131,8 +124,7 @@@
  msgid "  Installed: "
  msgstr "  Installerad: "
  
--#: cmdline/apt-cache.cc:1517
--#: cmdline/apt-cache.cc:1525
++#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
  msgid "(none)"
  msgstr "(ingen)"
  
@@@ -155,13 -155,13 +147,9 @@@ msgstr "  Versionstabell:
  msgid "       %4i %s\n"
  msgstr "       %4i %s\n"
  
--#: cmdline/apt-cache.cc:1652
--#: cmdline/apt-cdrom.cc:138
--#: cmdline/apt-config.cc:70
--#: cmdline/apt-extracttemplates.cc:225
--#: ftparchive/apt-ftparchive.cc:550
--#: cmdline/apt-get.cc:2369
--#: cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
++#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
++#: cmdline/apt-get.cc:2369 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr "%s %s för %s %s kompilerad den %s %s\n"
@@@ -313,8 -313,8 +301,7 @@@ msgstr "
  "  -c=? Läs denna inställningsfil.\n"
  "  -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n"
  
--#: cmdline/apt-extracttemplates.cc:267
--#: apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
  #, c-format
  msgid "Unable to write to %s"
  msgstr "Kunde inte skriva till %s"
@@@ -323,17 -323,17 +310,13 @@@
  msgid "Cannot get debconf version. Is debconf installed?"
  msgstr "Kan inte ta reda på debconfs version. Är debconf installerat?"
  
--#: ftparchive/apt-ftparchive.cc:167
--#: ftparchive/apt-ftparchive.cc:341
++#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
  msgid "Package extension list is too long"
  msgstr "Listan över filtillägg för Packages är för lång"
  
--#: ftparchive/apt-ftparchive.cc:169
--#: ftparchive/apt-ftparchive.cc:183
--#: ftparchive/apt-ftparchive.cc:206
--#: ftparchive/apt-ftparchive.cc:256
--#: ftparchive/apt-ftparchive.cc:270
--#: ftparchive/apt-ftparchive.cc:292
++#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
++#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
++#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
  #, c-format
  msgid "Error processing directory %s"
  msgstr "Fel vid behandling av katalogen %s"
@@@ -492,8 -492,8 +475,7 @@@ msgstr "V: 
  msgid "E: Errors apply to file "
  msgstr "F: Felen gäller filen "
  
--#: ftparchive/writer.cc:151
--#: ftparchive/writer.cc:181
++#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
  #, c-format
  msgid "Failed to resolve %s"
  msgstr "Misslyckades att slå upp %s"
@@@ -533,12 -533,12 +515,8 @@@ msgstr "*** Misslyckades att länka %s t
  msgid " DeLink limit of %sB hit.\n"
  msgstr " Avlänkningsgräns på %sB nådd.\n"
  
--#: ftparchive/writer.cc:358
--#: apt-inst/extract.cc:181
--#: apt-inst/extract.cc:193
--#: apt-inst/extract.cc:210
--#: apt-inst/deb/dpkgdb.cc:121
--#: methods/gpgv.cc:266
++#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
++#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
  #, c-format
  msgid "Failed to stat %s"
  msgstr "Misslyckades att ta status på %s"
@@@ -548,15 -548,15 +526,13 @@@
  msgid "Archive had no package field"
  msgstr "Arkivet har inget package-fält"
  
--#: ftparchive/writer.cc:394
--#: ftparchive/writer.cc:603
++#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
  #, c-format
  msgid "  %s has no override entry\n"
  msgstr "  %s har ingen post i override-filen\n"
  
  # parametrar: paket, ny, gammal
--#: ftparchive/writer.cc:437
--#: ftparchive/writer.cc:689
++#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
  #, c-format
  msgid "  %s maintainer is %s not %s\n"
  msgstr "  ansvarig för %s är %s ej %s\n"
@@@ -566,38 -566,38 +542,32 @@@
  msgid "Internal error, could not locate member %s"
  msgstr "Internt fel, kunde inta hitta delen %s"
  
--#: ftparchive/contents.cc:353
--#: ftparchive/contents.cc:384
++#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
  msgid "realloc - Failed to allocate memory"
  msgstr "realloc - Misslyckades att allokera minne"
  
--#: ftparchive/override.cc:38
--#: ftparchive/override.cc:146
++#: ftparchive/override.cc:38 ftparchive/override.cc:146
  #, c-format
  msgid "Unable to open %s"
  msgstr "Kunde inte öppna %s"
  
  # parametrar: filnamn, radnummer
--#: ftparchive/override.cc:64
--#: ftparchive/override.cc:170
++#: ftparchive/override.cc:64 ftparchive/override.cc:170
  #, c-format
  msgid "Malformed override %s line %lu #1"
  msgstr "Felaktig override %s rad %lu #1"
  
--#: ftparchive/override.cc:78
--#: ftparchive/override.cc:182
++#: ftparchive/override.cc:78 ftparchive/override.cc:182
  #, c-format
  msgid "Malformed override %s line %lu #2"
  msgstr "Felaktig override %s rad %lu #2"
  
--#: ftparchive/override.cc:92
--#: ftparchive/override.cc:195
++#: ftparchive/override.cc:92 ftparchive/override.cc:195
  #, c-format
  msgid "Malformed override %s line %lu #3"
  msgstr "Felaktig override %s rad %lu #3"
  
--#: ftparchive/override.cc:131
--#: ftparchive/override.cc:205
++#: ftparchive/override.cc:131 ftparchive/override.cc:205
  #, c-format
  msgid "Failed to read the override file %s"
  msgstr "Misslyckades att läsa override-filen %s"
@@@ -613,8 -613,8 +583,7 @@@ msgstr "Okänd komprimeringsalgoritm \"%
  msgid "Compressed output %s needs a compression set"
  msgstr "Komprimerad utdata %s behöver en komprimeringsuppsättning"
  
--#: ftparchive/multicompress.cc:172
--#: methods/rsh.cc:91
++#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
  msgid "Failed to create IPC pipe to subprocess"
  msgstr "Misslyckades att skapa IPC-rör till underprocess"
  
@@@ -660,8 -660,8 +629,7 @@@ msgstr "Misslyckades att läsa vid beräk
  msgid "Problem unlinking %s"
  msgstr "Problem med att länka ut %s"
  
--#: ftparchive/multicompress.cc:490
--#: apt-inst/extract.cc:188
++#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
  #, c-format
  msgid "Failed to rename %s to %s"
  msgstr "Misslyckades att byta namn på %s till %s"
@@@ -670,8 -670,8 +638,7 @@@
  msgid "Y"
  msgstr "J"
  
--#: cmdline/apt-get.cc:142
--#: cmdline/apt-get.cc:1506
++#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr "Fel vid tolkning av reguljärt uttryck - %s"
@@@ -816,8 -816,8 +783,7 @@@ msgstr "Installera dessa paket utan ver
  msgid "Some packages could not be authenticated"
  msgstr "Några av paketen kunde inte autentiseras"
  
--#: cmdline/apt-get.cc:711
--#: cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
  msgid "There are problems and -y was used without --force-yes"
  msgstr "Problem har uppstått och -y användes utan --force-yes"
  
@@@ -833,22 -833,22 +799,20 @@@ msgstr "Paket måste tas bort men \"Remo
  msgid "Internal error, Ordering didn't finish"
  msgstr "Internt fel. Sorteringen färdigställdes inte"
  
--#: cmdline/apt-get.cc:791
--#: cmdline/apt-get.cc:1800
--#: cmdline/apt-get.cc:1833
++#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
  msgid "Unable to lock the download directory"
  msgstr "Kunde inte låsa hämtningskatalogen."
  
--#: cmdline/apt-get.cc:801
--#: cmdline/apt-get.cc:1881
--#: cmdline/apt-get.cc:2117
++#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2117
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr "Listan över källor kunde inte läsas."
  
  #: cmdline/apt-get.cc:816
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
--msgstr "Konstigt.. storlekarna stämde inte, skicka e-post till apt@packages.debian.org"
++msgstr ""
++"Konstigt.. storlekarna stämde inte, skicka e-post till apt@packages.debian."
++"org"
  
  #: cmdline/apt-get.cc:821
  #, c-format
@@@ -870,8 -870,8 +834,7 @@@ msgstr "Efter uppackning kommer %sB ytt
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr "Efter uppackning kommer %sB frigöras på disken.\n"
  
--#: cmdline/apt-get.cc:846
--#: cmdline/apt-get.cc:1971
++#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr "Kunde inte läsa av ledigt utrymme i %s"
@@@ -881,8 -881,8 +844,7 @@@
  msgid "You don't have enough free space in %s."
  msgstr "Du har inte tillräckligt ledigt utrymme i %s"
  
--#: cmdline/apt-get.cc:864
--#: cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling."
  
@@@ -902,8 -902,8 +864,7 @@@ msgstr "
  " ?] "
  
  # Visas då man svarar nej
--#: cmdline/apt-get.cc:874
--#: cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
  msgid "Abort."
  msgstr "Avbryter."
  
@@@ -911,9 -911,9 +872,7 @@@
  msgid "Do you want to continue [Y/n]? "
  msgstr "Vill du fortsätta [J/n]? "
  
--#: cmdline/apt-get.cc:961
--#: cmdline/apt-get.cc:1365
--#: cmdline/apt-get.cc:2014
++#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2014
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr "Misslyckades att hämta %s  %s\n"
@@@ -922,14 -922,14 +881,17 @@@
  msgid "Some files failed to download"
  msgstr "Misslyckades att hämta vissa filer"
  
--#: cmdline/apt-get.cc:980
--#: cmdline/apt-get.cc:2023
++#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023
  msgid "Download complete and in download only mode"
  msgstr "Hämtningen färdig i \"endast-hämta\"-läge"
  
  #: cmdline/apt-get.cc:986
--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 --fix-missing."
++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 "
++"--fix-missing."
  
  #: cmdline/apt-get.cc:990
  msgid "--fix-missing and media swapping is not currently supported"
@@@ -951,7 -951,7 +913,8 @@@ msgstr "Observera, väljer %s istället f
  #: cmdline/apt-get.cc:1040
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
--msgstr "Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n"
++msgstr ""
++"Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n"
  
  #: cmdline/apt-get.cc:1058
  #, c-format
@@@ -1025,15 -1025,15 +988,18 @@@ msgid "Unable to lock the list director
  msgstr "Kunde inte låsa listkatalogen"
  
  #: cmdline/apt-get.cc:1384
--msgid "Some index files failed to download, they have been ignored, or old ones used instead."
--msgstr "Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla använts istället."
++msgid ""
++"Some index files failed to download, they have been ignored, or old ones "
++"used instead."
++msgstr ""
++"Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla "
++"använts istället."
  
  #: cmdline/apt-get.cc:1403
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr "Internt fel, AllUpgrade förstörde något"
  
--#: cmdline/apt-get.cc:1493
--#: cmdline/apt-get.cc:1529
++#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
  #, c-format
  msgid "Couldn't find package %s"
  msgstr "Kunde inte hitta paketet %s"
@@@ -1048,8 -1048,8 +1014,12 @@@ msgid "You might want to run `apt-get -
  msgstr "Du kan möjligen rätta detta genom att köra \"apt-get -f install\":"
  
  #: cmdline/apt-get.cc:1549
--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 (eller ange en lösning)."
++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 "
++"(eller ange en lösning)."
  
  #: cmdline/apt-get.cc:1561
  msgid ""
@@@ -1097,9 -1097,9 +1067,7 @@@ msgstr "Rekommenderade paket:
  msgid "Calculating upgrade... "
  msgstr "Beräknar uppgradering... "
  
--#: cmdline/apt-get.cc:1698
--#: methods/ftp.cc:702
--#: methods/connect.cc:101
++#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr "Misslyckades"
  
@@@ -1107,8 -1107,8 +1075,7 @@@
  msgid "Done"
  msgstr "Färdig"
  
--#: cmdline/apt-get.cc:1768
--#: cmdline/apt-get.cc:1776
++#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
  msgid "Internal error, problem resolver broke stuff"
  msgstr "Internt fel, problemlösaren bröt sönder saker"
  
@@@ -1116,8 -1116,8 +1083,7 @@@
  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"
  
--#: cmdline/apt-get.cc:1906
--#: cmdline/apt-get.cc:2135
++#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr "Kunde inte hitta något källkodspaket för %s"
@@@ -1191,18 -1191,18 +1157,27 @@@ msgstr "%s har inga byggberoenden.\n
  
  #: cmdline/apt-get.cc:2212
  #, c-format
--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"
++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"
  
  #: cmdline/apt-get.cc:2264
  #, c-format
--msgid "%s dependency for %s cannot be satisfied because no available versions of 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"
++msgid ""
++"%s dependency for %s cannot be satisfied because no available versions of "
++"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"
  
  #: cmdline/apt-get.cc:2299
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
--msgstr "Misslyckades att uppfylla %s-beroendet för %s: Det installerade paketet %s är för nytt"
++msgstr ""
++"Misslyckades att uppfylla %s-beroendet för %s: Det installerade paketet %s "
++"är för nytt"
  
  #: cmdline/apt-get.cc:2324
  #, c-format
@@@ -1375,12 -1375,12 +1350,8 @@@ msgstr "
  msgid "Bad default setting!"
  msgstr "Ogiltig standardinställning!"
  
--#: dselect/install:51
--#: dselect/install:83
--#: dselect/install:87
--#: dselect/install:93
--#: dselect/install:104
--#: dselect/update:45
++#: 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."
  
@@@ -1400,7 -1400,7 +1371,8 @@@ msgid "or errors caused by missing depe
  msgstr "saknade beroenden. Detta är okej, bara felen ovanför detta"
  
  #: dselect/install:103
--msgid "above this message are important. Please fix them and run [I]nstall again"
++msgid ""
++"above this message are important. Please fix them and run [I]nstall again"
  msgstr "meddelande är viktiga. Försök rätta dem och [I]nstallera igen"
  
  #: dselect/update:30
@@@ -1415,8 -1415,8 +1387,7 @@@ msgstr "Misslyckades att skapa rör
  msgid "Failed to exec gzip "
  msgstr "Misslyckades att köra gzip"
  
--#: apt-inst/contrib/extracttar.cc:180
--#: apt-inst/contrib/extracttar.cc:206
++#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
  msgid "Corrupted archive"
  msgstr "Fördärvat arkiv"
  
@@@ -1437,8 -1437,8 +1408,7 @@@ msgstr "Ogiltig arkivsignatur
  msgid "Error reading archive member header"
  msgstr "Misslyckades att läsa huvud för arkivdel"
  
--#: apt-inst/contrib/arfile.cc:93
--#: apt-inst/contrib/arfile.cc:105
++#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
  msgid "Invalid archive member header"
  msgstr "Ogiltigt arkivdelshuvud"
  
@@@ -1482,21 -1482,21 +1452,17 @@@ msgstr "Omdirigering %s -> %s inlagd tv
  msgid "Duplicate conf file %s/%s"
  msgstr "Duplicerad konfigurationsfil %s/%s"
  
--#: apt-inst/dirstream.cc:45
--#: apt-inst/dirstream.cc:50
--#: apt-inst/dirstream.cc:53
++#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
  #, c-format
  msgid "Failed to write file %s"
  msgstr "Misslyckades att skriva filen %s"
  
--#: apt-inst/dirstream.cc:96
--#: apt-inst/dirstream.cc:104
++#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
  #, c-format
  msgid "Failed to close file %s"
  msgstr "Misslyckades att stänga filen %s"
  
--#: apt-inst/extract.cc:96
--#: apt-inst/extract.cc:167
++#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
  #, c-format
  msgid "The path %s is too long"
  msgstr "Sökvägen %s är för lång"
@@@ -1516,8 -1516,8 +1482,7 @@@ msgstr "Katalogen %s är omdirigerad
  msgid "The package is trying to write to the diversion target %s/%s"
  msgstr "Paketet försöker skriva till omdirigeringsmålet %s/%s"
  
--#: apt-inst/extract.cc:157
--#: apt-inst/extract.cc:300
++#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
  msgid "The diversion path is too long"
  msgstr "Omdirigeringssökvägen är för lång"
  
@@@ -1545,12 -1545,12 +1510,9 @@@ msgstr "Skriver över paketträff utan ve
  msgid "File %s/%s overwrites the one in the package %s"
  msgstr "Filen %s/%s skriver över den i paketet %s"
  
--#: apt-inst/extract.cc:467
--#: apt-pkg/contrib/configuration.cc:750
--#: apt-pkg/contrib/cdromutl.cc:153
--#: apt-pkg/sourcelist.cc:324
--#: apt-pkg/acquire.cc:421
--#: apt-pkg/clean.cc:38
++#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
++#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
++#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
  #, c-format
  msgid "Unable to read %s"
  msgstr "Kunde inte läsa %s"
@@@ -1560,14 -1560,14 +1522,12 @@@
  msgid "Unable to stat %s"
  msgstr "Kunde inte ta status på %s"
  
--#: apt-inst/deb/dpkgdb.cc:55
--#: apt-inst/deb/dpkgdb.cc:61
++#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
  #, c-format
  msgid "Failed to remove %s"
  msgstr "Misslyckades att ta bort %s"
  
--#: apt-inst/deb/dpkgdb.cc:110
--#: apt-inst/deb/dpkgdb.cc:112
++#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
  #, c-format
  msgid "Unable to create %s"
  msgstr "Kunde inte skapa %s"
@@@ -1582,10 -1582,10 +1542,8 @@@ msgid "The info and temp directories ne
  msgstr "Katalogerna info och temp måste ligga på samma filsystem"
  
  #. Build the status cache
--#: apt-inst/deb/dpkgdb.cc:139
--#: apt-pkg/pkgcachegen.cc:643
--#: apt-pkg/pkgcachegen.cc:712
--#: apt-pkg/pkgcachegen.cc:717
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
++#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
  #: apt-pkg/pkgcachegen.cc:840
  msgid "Reading package lists"
  msgstr "Läser paketlistor"
@@@ -1596,24 -1596,24 +1554,26 @@@
  msgid "Failed to change to the admin dir %sinfo"
  msgstr "Kunde inte gå till adminkatalogen %sinfo"
  
--#: apt-inst/deb/dpkgdb.cc:201
--#: apt-inst/deb/dpkgdb.cc:355
++#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
  #: apt-inst/deb/dpkgdb.cc:448
  msgid "Internal error getting a package name"
  msgstr "Internt fel när namn på Package-fil skulle hämtas"
  
--#: apt-inst/deb/dpkgdb.cc:205
--#: apt-inst/deb/dpkgdb.cc:386
++#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
  msgid "Reading file listing"
  msgstr "Läser fillista"
  
  #: apt-inst/deb/dpkgdb.cc:216
  #, c-format
--msgid "Failed to open the list file '%sinfo/%s'. If you cannot restore this file then make it empty and immediately re-install the same version of the package!"
--msgstr "Misslyckades att öppna listfilen \"%sinfo/%s\". Om du inte kan återskapa filen, skapa en tom och installera omedelbart om samma version av paketet!"
++msgid ""
++"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
++"then make it empty and immediately re-install the same version of the "
++"package!"
++msgstr ""
++"Misslyckades att öppna listfilen \"%sinfo/%s\". Om du inte kan återskapa "
++"filen, skapa en tom och installera omedelbart om samma version av paketet!"
  
--#: apt-inst/deb/dpkgdb.cc:229
--#: apt-inst/deb/dpkgdb.cc:242
++#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
  #, c-format
  msgid "Failed reading the list file %sinfo/%s"
  msgstr "Misslyckades att läsa listfilen %sinfo/%s"
@@@ -1631,8 -1631,8 +1591,7 @@@ msgstr "Misslyckades att öppna omdirige
  msgid "The diversion file is corrupted"
  msgstr "Omdirigeringsfilen är trasig"
  
--#: apt-inst/deb/dpkgdb.cc:331
--#: apt-inst/deb/dpkgdb.cc:336
++#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
  #: apt-inst/deb/dpkgdb.cc:341
  #, c-format
  msgid "Invalid line in the diversion file: %s"
@@@ -1661,8 -1661,8 +1620,7 @@@ msgstr "Felaktiv ConfFile-sektion i sta
  msgid "Error parsing MD5. Offset %lu"
  msgstr "Fel vid tolkning av MD5. Offset %lu"
  
--#: apt-inst/deb/debfile.cc:42
--#: apt-inst/deb/debfile.cc:47
++#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
  #, c-format
  msgid "This is not a valid DEB archive, missing '%s' member"
  msgstr "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas"
@@@ -1696,8 -1696,8 +1654,12 @@@ msgid "Unable to read the cdrom databas
  msgstr "Kunde inte läsa cd-rom-databasen %s"
  
  #: methods/cdrom.cc:123
--msgid "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update cannot be used to add new CD-ROMs"
--msgstr "Använd apt-cdrom för att APT ska känna igen denna cd. apt-get update kan inte användas för att lägga till skivor"
++msgid ""
++"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
++"cannot be used to add new CD-ROMs"
++msgstr ""
++"Använd apt-cdrom för att APT ska känna igen denna cd. apt-get update kan "
++"inte användas för att lägga till skivor"
  
  #: methods/cdrom.cc:131
  msgid "Wrong CD-ROM"
@@@ -1712,22 -1712,22 +1674,16 @@@ msgstr "Kunde inte avmontera cd-rom:en 
  msgid "Disk not found."
  msgstr "Disk ej funnen."
  
--#: methods/cdrom.cc:177
--#: methods/file.cc:79
--#: methods/rsh.cc:264
++#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
  msgid "File not found"
  msgstr "Filen ej funnen"
  
--#: methods/copy.cc:42
--#: methods/gpgv.cc:275
--#: methods/gzip.cc:133
++#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
  #: methods/gzip.cc:142
  msgid "Failed to stat"
  msgstr "Kunde inte ta status"
  
--#: methods/copy.cc:79
--#: methods/gpgv.cc:272
--#: methods/gzip.cc:139
++#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
  msgid "Failed to set modification time"
  msgstr "Misslyckades sätta modifieringstid"
  
@@@ -1748,8 -1748,8 +1704,7 @@@ msgstr "Kunde inte ta reda på namn på p
  msgid "Unable to determine the local name"
  msgstr "Kunde inte ta reda på eget namn"
  
--#: methods/ftp.cc:204
--#: methods/ftp.cc:232
++#: methods/ftp.cc:204 methods/ftp.cc:232
  #, c-format
  msgid "The server refused the connection and said: %s"
  msgstr "Servern nekade anslutningen och sade: %s"
@@@ -1765,8 -1765,8 +1720,12 @@@ msgid "PASS failed, server said: %s
  msgstr "PASS misslyckades, servern sade: %s"
  
  #: methods/ftp.cc:237
--msgid "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin is empty."
--msgstr "En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::ProxyLogin är tom."
++msgid ""
++"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
++"is empty."
++msgstr ""
++"En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::"
++"ProxyLogin är tom."
  
  #: methods/ftp.cc:265
  #, c-format
@@@ -1778,10 -1778,10 +1737,7 @@@ msgstr "Inloggningsskriptskommandot \"%
  msgid "TYPE failed, server said: %s"
  msgstr "TYPE misslyckades, servern sade: %s"
  
--#: methods/ftp.cc:329
--#: methods/ftp.cc:440
--#: methods/rsh.cc:183
--#: methods/rsh.cc:226
++#: 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"
  
@@@ -1789,31 -1789,31 +1745,23 @@@
  msgid "Server closed the connection"
  msgstr "Servern stängde förbindelsen"
  
--#: methods/ftp.cc:338
--#: apt-pkg/contrib/fileutl.cc:471
--#: methods/rsh.cc:190
++#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
  msgid "Read error"
  msgstr "Läsfel"
  
--#: methods/ftp.cc:345
--#: methods/rsh.cc:197
++#: methods/ftp.cc:345 methods/rsh.cc:197
  msgid "A response overflowed the buffer."
  msgstr "Ett svar spillde bufferten."
  
--#: methods/ftp.cc:362
--#: methods/ftp.cc:374
++#: methods/ftp.cc:362 methods/ftp.cc:374
  msgid "Protocol corruption"
  msgstr "Protokollet fördärvat"
  
--#: methods/ftp.cc:446
--#: apt-pkg/contrib/fileutl.cc:510
--#: methods/rsh.cc:232
++#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
  msgid "Write error"
  msgstr "Skrivfel"
  
--#: methods/ftp.cc:687
--#: methods/ftp.cc:693
--#: methods/ftp.cc:729
++#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
  msgid "Could not create a socket"
  msgstr "Kunde inte skapa uttag (socket)"
  
@@@ -1863,9 -1863,9 +1811,7 @@@ msgstr "Anslutet datauttag (socket) fic
  msgid "Unable to accept connection"
  msgstr "Kunde inte ta emot anslutning"
  
--#: methods/ftp.cc:864
--#: methods/http.cc:958
--#: methods/rsh.cc:303
++#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
  msgid "Problem hashing file"
  msgstr "Problem med att lägga filen till hashtabellen"
  
@@@ -1874,8 -1874,8 +1820,7 @@@
  msgid "Unable to fetch file, server said '%s'"
  msgstr "Kunde inte hämta filen, servern sade \"%s\""
  
--#: methods/ftp.cc:892
--#: methods/rsh.cc:322
++#: methods/ftp.cc:892 methods/rsh.cc:322
  msgid "Data socket timed out"
  msgstr "Datauttag (socket) fick inte svar inom tidsgräns"
  
@@@ -1928,8 -1928,8 +1873,7 @@@ msgstr "Kunde inte ansluta till %s:%s (
  
  #. We say this mainly because the pause here is for the
  #. ssh connection that is still going
--#: methods/connect.cc:136
--#: methods/rsh.cc:425
++#: methods/connect.cc:136 methods/rsh.cc:425
  #, c-format
  msgid "Connecting to %s"
  msgstr "Ansluter till %s"
@@@ -1965,8 -1965,8 +1909,10 @@@ msgid "E: Argument list from Acquire::g
  msgstr "E: Argumentslistan från Acquire::gpgv::Options för lång. Avslutar."
  
  #: methods/gpgv.cc:198
--msgid "Internal error: Good signature, but could not determine key fingerprint?!"
--msgstr "Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!"
++msgid ""
++"Internal error: Good signature, but could not determine key fingerprint?!"
++msgstr ""
++"Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!"
  
  #: methods/gpgv.cc:203
  msgid "At least one invalid signature was encountered."
@@@ -1975,7 -1975,7 +1921,8 @@@ msgstr "Åtminstone en giltig signatur t
  #: methods/gpgv.cc:207
  #, 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?)"
++msgstr ""
++"Kunde inte starta \"%s\" för att verifiera signatur (är gnupg installerad?)"
  
  #: methods/gpgv.cc:212
  msgid "Unknown error executing gpgv"
@@@ -1986,8 -1986,8 +1933,12 @@@ msgid "The following signatures were in
  msgstr "Följande signaturer är ogiltiga:\n"
  
  #: methods/gpgv.cc:250
--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 är tillgänglig:\n"
++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 "
++"är tillgänglig:\n"
  
  #: methods/gzip.cc:57
  #, c-format
@@@ -2013,8 -2013,8 +1964,7 @@@ msgstr "Fick en ensam huvudrad på %u te
  msgid "Bad header line"
  msgstr "Trasig huvudrad"
  
--#: methods/http.cc:549
--#: methods/http.cc:556
++#: methods/http.cc:549 methods/http.cc:556
  msgid "The HTTP server sent an invalid reply header"
  msgstr "Http-servern sände ett ogiltigt svarshuvud"
  
@@@ -2128,8 -2128,8 +2078,7 @@@ msgstr "Syntaxfel %s:%u: Direktiv kan e
  msgid "Syntax error %s:%u: Too many nested includes"
  msgstr "Syntaxfel %s:%u: För många nästlade inkluderingar"
  
--#: apt-pkg/contrib/configuration.cc:695
--#: apt-pkg/contrib/configuration.cc:700
++#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
  #, c-format
  msgid "Syntax error %s:%u: Included from here"
  msgstr "Syntaxfel %s:%u: Inkluderad härifrån"
@@@ -2159,8 -2159,8 +2108,7 @@@ msgstr "%c%s... Färdig
  msgid "Command line option '%c' [from %s] is not known."
  msgstr "Kommandoradsflagga \"%c\" [från %s] är ej känd."
  
--#: apt-pkg/contrib/cmndline.cc:106
--#: apt-pkg/contrib/cmndline.cc:114
++#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
  #: apt-pkg/contrib/cmndline.cc:122
  #, c-format
  msgid "Command line option %s is not understood"
@@@ -2171,14 -2171,14 +2119,12 @@@ msgstr "Förstår inte kommandoradsflagga
  msgid "Command line option %s is not boolean"
  msgstr "Kommandoradsflaggan %s är inte boolsk"
  
--#: apt-pkg/contrib/cmndline.cc:166
--#: apt-pkg/contrib/cmndline.cc:187
++#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
  #, c-format
  msgid "Option %s requires an argument."
  msgstr "Flaggan %s kräver ett värde."
  
--#: apt-pkg/contrib/cmndline.cc:201
--#: apt-pkg/contrib/cmndline.cc:207
++#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
  #, c-format
  msgid "Option %s: Configuration item specification must have an =<val>."
  msgstr "Flagga %s: Den angivna konfigurationsposten måste innehålla =<värde>."
@@@ -2209,9 -2209,9 +2155,7 @@@ msgid "Unable to stat the mount point %
  msgstr "Kunde inte ta status på monteringspunkt %s."
  
  # Felmeddelande för misslyckad chdir
--#: apt-pkg/contrib/cdromutl.cc:149
--#: apt-pkg/acquire.cc:427
--#: apt-pkg/clean.cc:44
++#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
  #, c-format
  msgid "Unable to change to %s"
  msgstr "Kunde inte gå till %s"
@@@ -2359,16 -2359,16 +2303,15 @@@ msgstr "valfri
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:60
--#: apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Bygger beroendeträd"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Kandiderande versioner"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Beroendegenerering"
  
@@@ -2412,8 -2412,8 +2355,7 @@@ msgstr "Rad %lu i källistan %s har fel 
  msgid "Opening %s"
  msgstr "Öppnar %s"
  
--#: apt-pkg/sourcelist.cc:220
--#: apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr "Rad %u för lång i källistan %s."
@@@ -2428,16 -2428,16 +2370,22 @@@ msgstr "Rad %u i källistan %s har fel f
  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"
  
--#: apt-pkg/sourcelist.cc:252
--#: apt-pkg/sourcelist.cc:255
++#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
  #, c-format
  msgid "Malformed line %u in source list %s (vendor id)"
  msgstr "Rad %u i källistan %s har fel format (leverantörs-id)"
  
  #: apt-pkg/packagemanager.cc:402
  #, c-format
--msgid "This installation run will require temporarily removing the essential 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 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\"."
++msgid ""
++"This installation run will require temporarily removing the essential "
++"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 "
++"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\"."
  
  #: apt-pkg/pkgrecords.cc:37
  #, c-format
@@@ -2446,12 -2446,12 +2394,18 @@@ msgstr "Indexfiler av typ \"%s\" stöds 
  
  #: apt-pkg/algorithms.cc:241
  #, c-format
--msgid "The package %s needs to be reinstalled, but I can't find an archive for it."
--msgstr "Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det."
++msgid ""
++"The package %s needs to be reinstalled, but I can't find an archive for it."
++msgstr ""
++"Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det."
  
  #: apt-pkg/algorithms.cc:1059
--msgid "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages."
--msgstr "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på hållna paket."
++msgid ""
++"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
++"held packages."
++msgstr ""
++"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på "
++"hållna paket."
  
  #: apt-pkg/algorithms.cc:1061
  msgid "Unable to correct problems, you have held broken packages."
@@@ -2612,8 -2612,8 +2566,7 @@@ msgstr "Kunde inte ta status på källkod
  msgid "Collecting File Provides"
  msgstr "Samlar filberoenden"
  
--#: apt-pkg/pkgcachegen.cc:785
--#: apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
  msgid "IO Error saving source cache"
  msgstr "In-/utfel vid lagring av källcache"
  
@@@ -2622,8 -2622,8 +2575,7 @@@
  msgid "rename failed, %s (%s -> %s)."
  msgstr "namnbyte misslyckades, %s (%s -> %s)."
  
--#: apt-pkg/acquire-item.cc:236
--#: apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
  msgid "MD5Sum mismatch"
  msgstr "MD5-kontrollsumma stämmer inte"
  
@@@ -2633,17 -2633,17 +2585,26 @@@ msgstr "Det finns ingen publik nyckel t
  
  #: apt-pkg/acquire-item.cc:753
  #, c-format
--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 manuellt måste reparera detta paket (på grund av saknad arkitektur)."
++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 "
++"manuellt måste reparera detta paket (på grund av saknad arkitektur)."
  
  #: apt-pkg/acquire-item.cc:812
  #, c-format
--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 manuellt måste reparera detta paket."
++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 "
++"manuellt måste reparera detta paket."
  
  #: apt-pkg/acquire-item.cc:848
  #, c-format
--msgid "The package index files are corrupted. No Filename: field for package %s."
++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."
  
  #: apt-pkg/acquire-item.cc:935
@@@ -2664,8 -2664,8 +2625,7 @@@ msgstr "
  "Använder cd-rom-monteringspunkt %s\n"
  "Monterar cd-rom\n"
  
--#: apt-pkg/cdrom.cc:516
--#: apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
  msgid "Identifying.. "
  msgstr "Identifierar.. "
  
@@@ -2806,14 -2806,14 +2766,19 @@@ msgstr "Förbindelsen stängdes i förtid
  
  #~ msgid "Reading file list"
  #~ msgstr "Läser fillista"
++
  #~ msgid "Could not execute "
  #~ msgstr "Kunde inte exekvera "
++
  #~ msgid "Preparing for remove with config %s"
  #~ msgstr "Förbereder för borttagning med konfiguration %s"
++
  #~ msgid "Removed with config %s"
  #~ msgstr "Borttagen med konfiguration %s"
++
  #~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
  #~ msgstr "Okänt leverantörs-id \"%s\" på rad %u i källistan %s"
++
  #~ msgid ""
  #~ "Some broken packages were found while trying to process build-"
  #~ "dependencies.\n"
@@@ -2822,8 -2822,8 +2787,8 @@@
  #~ "Trasiga paket hittades när byggberoenden behandlades. Du kan "
  #~ "möjligen\n"
  #~ "rätta detta genom att köra \"apt-get -f install\"."
++
  #~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs."
  #~ msgstr ""
  #~ "Beklagar, men du har inte tillräckligt ledigt utrymme på %s för att "
  #~ "lagra alla .deb-filerna."
--

diff --cc po/tl.po
index d48db8b,d48db8b..669177a
--- 1/po/tl.po
--- 2/po/tl.po
+++ b/po/tl.po
@@@ -10,7 -10,7 +10,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-03-16 15:53+0800\n"
  "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
  "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@@ -2307,15 -2307,15 +2307,15 @@@ msgstr "optional
  msgid "extra"
  msgstr "extra"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "Ginagawa ang puno ng mga dependensiya"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "Bersyong Kandidato"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "Pagbuo ng Dependensiya"
  

diff --cc po/zh_CN.po
index f887f33,f887f33..789101a
--- 1/po/zh_CN.po
--- 2/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.5.23\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2006-02-22 14:20+1300\n"
  "Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n"
  "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n"
@@@ -2258,15 -2258,15 +2258,15 @@@ msgstr "可选
  msgid "extra"
  msgstr "额外"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "正在分析软件包的依赖关系树"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "候选版本"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "生成依赖关系"
  

diff --cc po/zh_TW.po
index e9e27bb,062ce56..15d5f3c
--- 1/po/zh_TW.po
--- 2/po/zh_TW.po
+++ b/po/zh_TW.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: 0.5.4\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2006-05-16 07:33-0500\n"
++"POT-Creation-Date: 2006-05-27 13:46+0200\n"
  "PO-Revision-Date: 2005-02-19 22:24+0800\n"
  "Last-Translator: Asho Yeh <asho@debian.org.tw>\n"
  "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n"
@@@ -2270,15 -2270,15 +2270,15 @@@ msgstr "次要
  msgid "extra"
  msgstr "添加"
  
--#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
++#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
  msgid "Building dependency tree"
  msgstr "了解套件依存關係中"
  
--#: apt-pkg/depcache.cc:61
++#: apt-pkg/depcache.cc:62
  msgid "Candidate versions"
  msgstr "候選版本"
  
--#: apt-pkg/depcache.cc:90
++#: apt-pkg/depcache.cc:91
  msgid "Dependency generation"
  msgstr "產生套件依存關係"