merged debian-sid branch and resolved conflicts

diff --cc apt-pkg/acquire-item.cc
Simple merge

diff --cc apt-pkg/contrib/configuration.cc
Simple merge

diff --cc apt-pkg/contrib/fileutl.cc
Simple merge

diff --cc apt-pkg/contrib/netrc.cc
Simple merge

diff --cc apt-pkg/contrib/strutl.cc
Simple merge

diff --cc apt-pkg/deb/dpkgpm.cc
Simple merge

diff --cc apt-pkg/pkgcache.cc
Simple merge

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/changelog
index 0531cc1e6fe4b94b9e9a0af3432c283319b364e8,2910501b83c0d3ee15f299dd011f4b21c6ae89cb..7b842e7e46b770c4df856a2371445479ac56f409
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,138 +1,177 @@@
- apt (0.9.7.8) UNRELEASED; urgency=low
 +apt (0.9.8~exp1) UNRELEASED; urgency=low
 +
 +  [ David Kalnischkies ]
 +  * apt-pkg/contrib/strutl.cc:
 +    - support \n and \r\n line endings in ReadMessages
 +
 +  [ Michael Vogt ]
 +  * lp:~mvo/apt/webserver-simulate-broken-with-fix346386:
 +    - fix invalid InRelease file download checking and add regression
 +      test to server broken files to the buildin test webserver
 +  * stop exporting the accidently exported parsenetrc() symbol
 +  * lp:~mvo/apt/add-glob-function:
 +    -  add Glob() to fileutl.{cc,h}
 +  * lp:~mvo/apt/config-clear:
 +    - support Configuration.Clear() for a clear of the entire 
 +      configuration
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - use tcgetattr() on STDOUT instead of STDIN so that term.log
 +      works for redirected stdin
 +    - print error in log if tcgetattr() fails instead of writing
 +      a empty file
 +  * use sha512 when available (LP: #1098752)
 +  * [ABI-Break] lp:~mvo/apt/source-hashes:
 +    - use sha{512,256,1} for deb-src when available LP: #1098738
 + 
 +  [ Marc Deslauriers ]
 +  * make apt-ftparchive generate missing deb-src hashes (LP: #1078697)
 +
 + -- Michael Vogt <mvo@debian.org>  Fri, 01 Mar 2013 12:12:39 +0100
 +
+ apt (0.9.7.9~exp3) UNRELEASED; urgency=low
+ 
+   [ Michael Vogt ]
+   * apt-pkg/sourcelist.cc:
+     - fix segfault when a hostname contains a [, thanks to 
+       Tzafrir Cohen (closes: #704653)
+   * debian/control:
+     - replace manpages-it (closes: #704723)
+ 
+   [ David Kalnischkies ]
+   * various simple changes to fix cppcheck warnings
+   * apt-pkg/pkgcachegen.cc:
+     - do not store the MD5Sum for every description language variant as
+       it will be the same for all so it can be shared to save cache space
+     - handle language tags for descriptions are unique strings to be shared
+     - factor version string creation out of NewDepends, so we can easily reuse
+       version strings e.g. for implicit multi-arch dependencies
+     - equal comparisions are used mostly in same-source relations,
+       so use this to try to reuse some version strings
+     - sort group and package names in the hashtable on insert
+     - share version strings between same versions (of different architectures)
+       to save some space and allow quick comparisions later on
+   * apt-pkg/pkgcache.cc:
+     - assume sorted hashtable entries for groups/packages
+   * apt-pkg/cacheiterators.h:
+     - provide DepIterator::IsSatisfied as a nicer shorthand for DepCheck
+   * apt-pkg/deb/debversion.cc:
+     - add a string-equal shortcut for equal version comparisions
+ 
+   [ Marc Deslauriers ]
+   * make apt-ftparchive generate missing deb-src hashes (LP: #1078697)
+ 
+  -- Michael Vogt <mvo@debian.org>  Mon, 08 Apr 2013 08:43:21 +0200
+ 
+ apt (0.9.7.9~exp2) experimental; urgency=low
+ 
+   [ Programs translations ]
+   * Update all PO files and apt-all.pot
+   * French translation completed (Christian Perrier)
+   
+   [ Daniel Hartwig ]
+   * cmdline/apt-get.cc:
+     - do not have space between "-a" and option when cross building
+       (closes: #703792)
+   * test/integration/test-apt-get-download:
+     - fix test now that #1098752 is fixed
+   * po/{ca,cs,ru}.po:
+     - fix merge artifact
+ 
+   [ David Kalnischkies ]
+   * apt-pkg/indexcopy.cc:
+     - rename RunGPGV to ExecGPGV and move it to apt-pkg/contrib/gpgv.cc
+   * apt-pkg/contrib/gpgv.cc:
+     - ExecGPGV is a method which should never return, so mark it as such
+       and fix the inconsistency of returning in error cases
+     - don't close stdout/stderr if it is also the statusfd
+     - if ExecGPGV deals with a clear-signed file it will split this file
+       into data and signatures, pass it to gpgv for verification
+     - add method to open (maybe) clearsigned files transparently
+   * apt-pkg/acquire-item.cc:
+     - keep the last good InRelease file around just as we do it with
+       Release.gpg in case the new one we download isn't good for us
+   * apt-pkg/deb/debmetaindex.cc:
+     - reenable InRelease by default
+   * ftparchive/writer.cc,
+     apt-pkg/deb/debindexfile.cc,
+     apt-pkg/deb/deblistparser.cc:
+     - use OpenMaybeClearSignedFile to be free from detecting and
+       skipping clearsigning metadata in dsc and Release files
+ 
+   [ Michael Vogt ]
+   * add regression test for CVE-2013-1051
+   * implement GPGSplit() based on the idea from Ansgar Burchardt
+     (many thanks!)
+   * methods/connect.cc:
+     - use Errno() instead of strerror(), thanks to David Kalnischk
+   * doc/apt.conf.5.xml:
+     - document Acquire::ForceIPv{4,6}
+ 
+  -- Michael Vogt <mvo@debian.org>  Wed, 03 Apr 2013 14:19:58 +0200
+ 
+ apt (0.9.7.9~exp1) experimental; urgency=low
+ 
+   [ Niels Thykier ]
+   * test/libapt/assert.h, test/libapt/run-tests:
+     - exit with status 1 on test failure
+   
+   [ Daniel Hartwig ]
+   * test/integration/framework:
+     - continue after test failure but preserve exit status
+ 
+   [ Programs translation updates ]
+   * Turkish (Mert Dirik). Closes: #703526
+ 
+   [ Colin Watson ]
+   * methods/connect.cc:
+     - provide useful error message in case of EAI_SYSTEM
+       (closes: #703603)
+   
+   [ Michael Vogt ]
+   * add new config options "Acquire::ForceIPv4" and 
+     "Acquire::ForceIPv6" to allow focing one or the other
+     (closes: #611891)
+   * lp:~mvo/apt/fix-tagfile-hash:
+     - fix false positives in pkgTagSection.Exists(), thanks to
+       Niels Thykier for the testcase (closes: #703240)
+     - this will require rebuilds of the clients as this used to
+       be a inline function
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 22 Mar 2013 21:57:08 +0100
+ 
+ apt (0.9.7.8) unstable; urgency=criticial
+ 
+   * SECURITY UPDATE: InRelease verification bypass
+     - CVE-2013-1051
+   
++  [ Programs translation updates ]
++  * Japanese (Kenshi Muto). Closes: #699783
++  
+   [ David Kalnischk ]
+   * apt-pkg/deb/debmetaindex.cc,
+     test/integration/test-bug-595691-empty-and-broken-archive-files,
++  * [ABI BREAK] apt-pkg/pkgcache.h:
++    - adjust pkgCache::State::VerPriority enum, to match reality
+     test/integration/test-releasefile-verification:
+     - disable InRelease downloading until the verification issue is
+       fixed, thanks to Ansgar Burchardt for finding the flaw
++    - quote plus in filenames to work around a bug in the S3 server
++      (LP: #1003633)
++  * apt-pkg/indexrecords.cc:
++    - support '\r' in the Release file
+ 
+  -- Michael Vogt <mvo@debian.org>  Thu, 14 Mar 2013 07:47:36 +0100
+ 
+ apt (0.9.7.8~exp2) experimental; urgency=low
+ 
+   * include two missing patches to really fix bug #696225, thanks to
+     Guillem Jover 
+   * ensure sha512 is really used when available, thanks to Tyler Hicks
+    (LP: #1098752)
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 01 Mar 2013 19:06:55 +0100
+ 
+ apt (0.9.7.8~exp1) experimental; urgency=low
  
    [ Manpages translation updates ]
    * Italian (Beatrice Torracca). Closes: #696601

diff --cc debian/control
Simple merge

diff --cc po/ar.po
index dd1a681180cd57afa069c77d926e3be669b5d277,1b56be6c7de1c53242a62fc3aa3c67175d90891b..cea208981a2767f7838bcd5828825b74aedad79c
--- 1/po/ar.po
--- 2/po/ar.po
+++ b/po/ar.po
@@@ -3203,6 -3200,6 +3203,10 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... تمّ"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "فتح ملف التهيئة %s"

diff --cc po/ast.po
index c0cafb68512b5e2b6ad1667e0cb83408833bc26c,25388ddbb964dc0b31d7c05a2f2ac2babad6b03b..83927878230c2afb89831dbe16a6d06f64b24d8d
--- 1/po/ast.po
--- 2/po/ast.po
+++ b/po/ast.po
@@@ -3476,6 -3470,6 +3476,14 @@@ msgstr "
  msgid "Not locked"
  msgstr "Non bloquiáu"
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Daqué raro asocedió resolviendo '%s:%s' (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Fecho"
++
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Saltando'l ficheru non esistente %s"
  

diff --cc po/bg.po
index d05bdbca0ac79f22c9c3312cdb83b76badfe13a7,7378aae7483495f12973ab17e99e78360da5000f..872ba7dfe4edc9833ba401408065d9e8f50cd1f3
--- 1/po/bg.po
--- 2/po/bg.po
+++ b/po/bg.po
@@@ -3536,6 -3530,9 +3536,14 @@@ msgstr "
  msgid "Not locked"
  msgstr "Без заключване"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "Файлът %s не започва с информация за подписване в обикновен текст."
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Готово"
+ 
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Пропускане на несъществуващ файл %s"
  

diff --cc po/ca.po
index 909de847fff3a6a33c71fdb694bdf48a8ec7f115,ddbaf731a7cb3928bfe3d5c07cadba871149f062..45e904247b4c7a86f1df0ed1bbf7fb925f17d12a
--- 1/po/ca.po
--- 2/po/ca.po
+++ b/po/ca.po
@@@ -3521,6 -3515,9 +3521,13 @@@ msgstr "
  msgid "Not locked"
  msgstr "No blocat"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "El fitxer %s no comença amb un missatge signat en clar"
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i - %s)"
++
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s… %u%%"
+ 
  #~ msgid "decompressor"
  #~ msgstr "decompressor"
  

diff --cc po/cs.po
index 9cc77b05b4c00de694638005195c1673cacb80b9,ffe773302d555c0ea41213bb706d5711056cbee5..50a7400345529a28d9dcb1445fed193c87b3cf00
--- 1/po/cs.po
--- 2/po/cs.po
+++ b/po/cs.po
@@@ -3459,6 -3455,9 +3459,13 @@@ msgstr "dpkg byl přerušen, pro nápra
  msgid "Not locked"
  msgstr "Není uzamčen"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "Soubor %s nezačíná podpisem"
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Něco hodně ošklivého se přihodilo při překladu „%s:%s“ (%i - %s)"
++
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s… %u%%"
+ 
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Přeskakuji neexistující soubor %s"
  

diff --cc po/cy.po
index 825bc18b3d6bb4ba1bffef064bc432b9fff690dc,ae7173a4096f7e32e561097172639b5a18aa1a79..744deb2951a833dd4820139dd1ecf74dabd86627
--- 1/po/cy.po
--- 2/po/cy.po
+++ b/po/cy.po
@@@ -3503,6 -3500,6 +3503,14 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Wedi Gorffen"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Yn agor y ffeil cyfluniad %s"

diff --cc po/da.po
index c00620a89e99564a80f46d277388595322b323c7,db109ad0f1b237c73393d6e57b58bca1677c6553..71f5a7248922ab85b7a39e244c59a60cf965d5b7
--- 1/po/da.po
--- 2/po/da.po
+++ b/po/da.po
@@@ -3483,6 -3479,9 +3483,14 @@@ msgstr "dpkg blev afbrudt, du skal manu
  msgid "Not locked"
  msgstr "Ikke låst"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "Fil %s starter ikke med en »clearsigned« besked"
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Færdig"
+ 
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Springer ikkeeksisterende fil over %s"
  

diff --cc po/de.po
index 9700932110ad7c79b9c34f9fd313b36fbce67aa5,276c0def7b7af681f87c038e59b1301985165e66..36017866bb7b0783ee363b8e482df2a668591218
--- 1/po/de.po
--- 2/po/de.po
+++ b/po/de.po
@@@ -3598,6 -3592,9 +3598,14 @@@ msgstr "
  msgid "Not locked"
  msgstr "Nicht gesperrt"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "Datei %s beginnt nicht mit einer Klartext-signierten Nachricht."
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)."
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Fertig"
+ 
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Nicht vorhandene Datei %s wird übersprungen."
  

diff --cc po/dz.po
index ad2b36326aacfb9a11b622efbadb23e517e5241d,82257ac5ed73d73ad0187cf2b8e6fe2477331cb0..b8500832ede14d185cbfce2a9a02c1590c85919c
--- 1/po/dz.po
--- 2/po/dz.po
+++ b/po/dz.po
@@@ -3429,6 -3426,6 +3429,14 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... འབད་ཚར་ཡོད།"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།"

diff --cc po/el.po
index 36e638fc5bd0c128aaa9fb9e2e374bfaf4c89d15,1fcf3303aa34f726a3a70c8501cd33ca096e6cda..353d073b1b22ccdb3faadc6047fea6949bba5183
--- 1/po/el.po
--- 2/po/el.po
+++ b/po/el.po
@@@ -3467,6 -3461,6 +3467,14 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Ολοκληρώθηκε"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s"

diff --cc po/es.po
index 3457483c9899b2612fbb0fefe594aa2b2bca6bdb,0307f0558abb6b00d5b15102b6491d425c6d52cd..226c3f73d24edf65c104d49e65d349b9d94b9497
--- 1/po/es.po
--- 2/po/es.po
+++ b/po/es.po
@@@ -3580,6 -3574,6 +3580,14 @@@ msgstr "
  msgid "Not locked"
  msgstr "No bloqueado"
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Algo raro pasó al resolver «%s:%s» (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Hecho"
++
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Omitiendo el fichero inexistente %s"
  

diff --cc po/eu.po
index 0265c086bfe93ad14d79fb411643aedb4a07bb71,0837041827af3898e5fd72afdd6a278e9f1b2235..d9ec43cdfd20a1237e28d8173bb05f51c6b6ebb7
--- 1/po/eu.po
--- 2/po/eu.po
+++ b/po/eu.po
@@@ -3432,6 -3426,6 +3432,14 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Eginda"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "%s konfigurazio fitxategia irekitzen"

diff --cc po/fi.po
index 8770d5a0c31b042fb33e1ea251cd83a226f009e6,0157fcf3bad39b862629e74b6d0d60b7be98a080..0d8f885372cf6d2d9a187433356d835a93cc27cb
--- 1/po/fi.po
--- 2/po/fi.po
+++ b/po/fi.po
@@@ -3425,6 -3419,6 +3425,14 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Valmis"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Avataan asetustiedosto %s"

diff --cc po/fr.po
index e7f47c56ab97f0ec985c826ac01d0c857363d226,7fed478673bad7cf609ae6db02a9c49307a7263b..c9b517ab1dfd77c33c0171253fecac888af20430
--- 1/po/fr.po
--- 2/po/fr.po
+++ b/po/fr.po
@@@ -8,8 -8,8 +8,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: fr\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 -"POT-Creation-Date: 2013-04-03 14:20+0200\n"
 +"POT-Creation-Date: 2013-03-01 12:27+0100\n"
- "PO-Revision-Date: 2012-06-25 19:58+0200\n"
+ "PO-Revision-Date: 2013-03-24 08:57+0100\n"
  "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
  "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
  "Language: fr\n"
@@@ -3605,6 -3599,9 +3605,13 @@@ msgstr "
  msgid "Not locked"
  msgstr "Non verrouillé"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "Le fichier %s ne commence pas par un message signé en clair."
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Erreur système lors de la résolution de « %s:%s » (%s)"
++
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s… %u%%"
+ 
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Fichier %s inexistant ignoré"
  

diff --cc po/gl.po
index 19082cc5358c5e677ae0d7c47dc3dacce7271d13,0ce8a5354430e0e8d13a3a9343b2bbb3ffcb071f..000191888c0b99f49236087870f6b55010e9ffec
--- 1/po/gl.po
--- 2/po/gl.po
+++ b/po/gl.po
@@@ -3522,6 -3516,6 +3522,14 @@@ msgstr "
  msgid "Not locked"
  msgstr "Non está bloqueado"
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Aconteceu algo malo, buscando «%s:%s» (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Feito"
++
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Omitindo o ficheiro inexistente %s"
  

diff --cc po/hu.po
index 0292d2b1ac9475304e3e8d5b21de11900d26ca34,a5714f56db30d950751ea43154f65b32106c7ce9..4899eddc764fefeacbf246c2767f09c82dfb8216
--- 1/po/hu.po
--- 2/po/hu.po
+++ b/po/hu.po
@@@ -3516,6 -3511,9 +3516,14 @@@ msgstr "
  msgid "Not locked"
  msgstr "Nincs zárolva"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "A(z) %s fájl nem digitálisan aláírt üzenettel kezdődik"
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Hiba történt „%s:%s” feloldásakor (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Kész"
+ 
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "A nem létező %s fájl kihagyása"
  

diff --cc po/it.po
index 311559d453ebebc780c58fcf3c1e2c4736cc712d,18613cd41e9b389e7ee7a53549b25a9aaab75706..01ac215c690f7ed6a75fb0ecb8c01bc3ae540dc6
--- 1/po/it.po
--- 2/po/it.po
+++ b/po/it.po
@@@ -3577,6 -3572,9 +3577,16 @@@ msgstr "
  msgid "Not locked"
  msgstr "Non bloccato"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "Il file %s non inizia con un messaggio di firma in chiaro"
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr ""
++#~ "Si è verificato qualcosa di anormale nella risoluzione di \"%s:%s\" (%i - "
++#~ "%s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Fatto"
+ 
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Saltato il file inesistente %s"
  

diff --cc po/ja.po
index 75f1b07b41d74272966027bf5c60067b4d17fdc1,7f02fa9af74ecd419e2d473cf4bbf4f9a9ced88d..b982bd3010834d780ea82ac571df55bf2bfb2fb7
--- 1/po/ja.po
--- 2/po/ja.po
+++ b/po/ja.po
@@@ -8,8 -8,8 +8,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: apt 0.9.7.1\n"
  "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 -"POT-Creation-Date: 2013-04-03 14:20+0200\n"
 +"POT-Creation-Date: 2013-03-01 12:27+0100\n"
- "PO-Revision-Date: 2013-02-05 09:41+0900\n"
+ "PO-Revision-Date: 2012-07-01 00:14+0900\n"
  "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
  "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
  "Language: ja\n"
@@@ -3509,5 -3503,8 +3509,13 @@@ msgstr "
  msgid "Not locked"
  msgstr "ロックされていません"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "ファイル %s はクリア署名されたメッセージで始まっていません"
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "'%s:%s' (%i - %s) の解決中に何か問題が起こりました"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... 完了"
+ 
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "存在しないファイル %s をスキップしています"

diff --cc po/km.po
index 3029e6e65c8396f3acc7b085bacbc00255eb3123,e6048afdc6274e4b818de4189fc1b690f882b04b..662625cada6a49dbaf18ff71a4c1935ac4c328dd
--- 1/po/km.po
--- 2/po/km.po
+++ b/po/km.po
@@@ -3388,6 -3385,6 +3388,14 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... ធ្វើរួច​"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "កំពុង​បើ​ឯកសារ​កំណត់រចនាសម្ព័ន្ធ​ %s"

diff --cc po/ko.po
index 05d6af00c6031965f923f4255479781796175708,7cfbbc32cdc8a46479ac01a30943bef46c4085da..70645bd90308fea3ba3f763337fd26d5e0dc430c
--- 1/po/ko.po
--- 2/po/ko.po
+++ b/po/ko.po
@@@ -3431,6 -3426,6 +3431,15 @@@ msgstr "
  msgid "Not locked"
  msgstr "잠기지 않음"
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr ""
++#~ "'%s:%s'의 주소를 알아내는데 무언가 이상한 일이 발생했습니다 (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... 완료"
++
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "%s 파일은 없으므로 무시합니다"
  

diff --cc po/ku.po
index 232be1177cd7e2e2dffdc694b8a1e6d744daf3a5,bc27255504dbffb188239855c7cb97f7c9a51859..0334945a9ae6051ce1ec74ed972878db924519b9
--- 1/po/ku.po
--- 2/po/ku.po
+++ b/po/ku.po
@@@ -3215,6 -3212,6 +3215,10 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Çêbû"
++
  #~ msgid "Failed to remove %s"
  #~ msgstr "Rakirina %s biserneket"
  

diff --cc po/lt.po
index 9a34a45428c30933325aa222d4f7c1f6c0e588f8,d6a7cc6e4fd94712c8443c0e6e51e758b3ae0ce7..ec91ec2028149baa8683eefae5c15c710f40fe68
--- 1/po/lt.po
--- 2/po/lt.po
+++ b/po/lt.po
@@@ -3314,6 -3311,6 +3314,14 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Laikinas sutrikimas ieškant vardo „%s“"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Baigta"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Praleidžiama jau parsiųsta byla „%s“\n"

diff --cc po/mr.po
index 9bfa878a5eb592957329b49d448993275f342347,9bb37debdfbbdf4bc3f9d683dfa248c42fd6383c..d2ade89c76b89d4e39c35e4b6adeadb192e3a4a0
--- 1/po/mr.po
--- 2/po/mr.po
+++ b/po/mr.po
@@@ -3402,6 -3398,6 +3402,14 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... झाले"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "%s संरचना फाईल उघडत आहे"

diff --cc po/nb.po
index 6911c4fae24e19dd8ba8cdcd48cee22192f73299,1934a25c8b363c71ad4f134485c3b6dd7123ce44..253900f7a9bb1551d31912785f1d878c7d178db5
--- 1/po/nb.po
--- 2/po/nb.po
+++ b/po/nb.po
@@@ -3459,6 -3455,6 +3459,14 @@@ msgstr "dpkg ble avbrutt. Du må kjør
  msgid "Not locked"
  msgstr "Ikke låst"
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s ... Ferdig"
++
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Hopper over den ikke-eksisterende fila %s"
  

diff --cc po/ne.po
index 445f82de7bc0e9ea49764a5574d9918aa78e3ff6,66064f5594641ed585d3f4425d1f8e36d7d6bd18..dc25604acff91e1fe329b23bdbbe8f038da5ab71
--- 1/po/ne.po
--- 2/po/ne.po
+++ b/po/ne.po
@@@ -3392,6 -3389,6 +3392,14 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... गरियो"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "कनफिगरेसन फाइल खोलिदैछ %s"

diff --cc po/nl.po
index b6f17b1c0dfacf0ab7b5a592ebf5ef23a54f73a2,408ce4b8b9a69d5f0681cadb4beac80c4344fc02..a3479d172ceb7b28c9569b42fd937634776800e8
--- 1/po/nl.po
--- 2/po/nl.po
+++ b/po/nl.po
@@@ -3523,6 -3517,6 +3523,14 @@@ msgstr "
  msgid "Not locked"
  msgstr "Niet vergrendeld"
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Er gebeurde iets raars bij het oplossen van '%s:%s' (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Klaar"
++
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Niet-bestaand bestand %s wordt overgeslagen"
  

diff --cc po/nn.po
index 9b364902f2103806138dddf9079e56cb04024cea,768999104750321ffd1b38b1e63e46d41107ca6e..f59e9095cd55dec0d312151b9d1d95423643c0f2
--- 1/po/nn.po
--- 2/po/nn.po
+++ b/po/nn.po
@@@ -3411,6 -3408,6 +3411,14 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Det hende noko dumt ved oppslag av «%s:%s» (%i)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s ... Ferdig"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Opnar oppsettsfila %s"

diff --cc po/pl.po
index a92ace3122fb8e600049a23eb190c02445a450a0,61c3cd2b33750a52df45dc479ee6afdc94a97f38..d0918b4ed6dfb9d19fcf03bab6fedcc7e066c74f
--- 1/po/pl.po
--- 2/po/pl.po
+++ b/po/pl.po
@@@ -3550,6 -3544,9 +3550,14 @@@ msgstr "
  msgid "Not locked"
  msgstr "Niezablokowany"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "Plik %s nie zaczyna się wiadomością podpisaną w trybie clearsign"
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Gotowe"
+ 
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Pomijanie nieistniejącego pliku %s"
  

diff --cc po/pt.po
index 0cf989d76818832d67bb2397fbaea8887a36db52,542e1efba0e4f787bb966d8b3462ff701520cbc7..143de926cb4e315e868e1f2a6d7bd9b1b0f2d4f3
--- 1/po/pt.po
--- 2/po/pt.po
+++ b/po/pt.po
@@@ -3541,6 -3535,9 +3541,14 @@@ msgstr "
  msgid "Not locked"
  msgstr "Sem acesso exclusivo"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "O ficheiro %s não começa com uma mensagem assinada"
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Pronto"
+ 
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "A saltar ficheiro %s inexistente"
  

diff --cc po/pt_BR.po
index 4774849fea585db4649e987c177f5dd01565106c,86a90305b4355e1d04ec020453392ca675b18302..5227f55751e1a7bd2984db5014b6655592fac7a1
--- 1/po/pt_BR.po
--- 2/po/pt_BR.po
+++ b/po/pt_BR.po
@@@ -3461,6 -3457,6 +3461,14 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Pronto"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Abrindo arquivo de configuração %s"

diff --cc po/ro.po
index 7577be8305f8b25112ec5c9a2197b1931df93311,343ee4cdfe86666153112c3745098887577034da..549407fcc64ce1438a0d455d6c7a89498b676679
--- 1/po/ro.po
--- 2/po/ro.po
+++ b/po/ro.po
@@@ -3469,6 -3464,6 +3469,14 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Terminat"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Se deschide fișierul de configurare %s"

diff --cc po/ru.po
index d252fa846639a772dd9f6fe242039127dfc8efd8,c33fb984480adf026eb858ae187844f0bc3309ad..73c993bee217e6a20a9689dabae35022fd0615f9
--- 1/po/ru.po
--- 2/po/ru.po
+++ b/po/ru.po
@@@ -3554,6 -3548,9 +3554,13 @@@ msgstr "
  msgid "Not locked"
  msgstr "Не заблокирован"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "Файл %s не начинается с прозрачно подписанного сообщения"
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Что-то странное произошло при определении «%s:%s» (%i - %s)"
++
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s… %u%%"
+ 
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Пропускается несуществующий файл %s"
  

diff --cc po/sk.po
index 482b5ccdf9190a8cc38d25289d604155cdeca7b4,883ad8b2f7b72d0f91f7c40cebc5bd349c6a4704..36f17cd5bca1ee51f395a11fc1e4b7eabb4e0216
--- 1/po/sk.po
--- 2/po/sk.po
+++ b/po/sk.po
@@@ -3486,6 -3480,9 +3486,14 @@@ msgstr "dpkg bol prerušený, musíte r
  msgid "Not locked"
  msgstr "Nie je zamknuté"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "Súbor %s nezačína podpísanou správou v čistom texte (clearsigned)"
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Niečo veľmi zlé sa prihodilo pri preklade „%s:%s“ (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Hotovo"
+ 
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Preskakuje sa neexistujúci súbor %s"
  

diff --cc po/sl.po
index 450c1d2e24cbd00d6e3178e13e1e8f6d93e0cca0,1a0155f39feaebfb0de9ee1d2106dd127834dfe3..ee33315bbd45e43dfc5322b329cc2141af092da3
--- 1/po/sl.po
--- 2/po/sl.po
+++ b/po/sl.po
@@@ -3492,6 -3486,9 +3492,14 @@@ msgstr "dpkg je bil prekinjen. Za popra
  #: apt-pkg/deb/debsystem.cc:121
  msgid "Not locked"
  msgstr "Ni zaklenjeno"
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "Datoteka %s se ne začne s čisto podpisanim sporočilom"
+ 
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Nekaj čudnega se je zgodilo med razreševanjem '%s:%s' (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s ... Narejeno"
  
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Preskok neobstoječe datoteke %s"

diff --cc po/sv.po
index 76d36ceff09b12845d5f17047d2bb10419701a7a,021578ace38461e37191670e03918dacc187aba6..429fdc570d3ad22c8ebccf4701262f964548aa69
--- 1/po/sv.po
--- 2/po/sv.po
+++ b/po/sv.po
@@@ -3491,6 -3487,6 +3491,15 @@@ msgstr "
  msgid "Not locked"
  msgstr "Inte låst"
  
++# Okänd felkod; %i = koden
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Färdig"
++
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Hoppar över icke-existerande filen %s"
  

diff --cc po/th.po
index 4f8c1a145014845f44755515671a4d0e5f603c55,5e2f51c1e42f04b3545c95a2c964b68f790a3658..a42daeb3b09ab5d12a7f8c116be17d935843bda3
--- 1/po/th.po
--- 2/po/th.po
+++ b/po/th.po
@@@ -3401,6 -3395,9 +3401,14 @@@ msgstr "dpkg à¸\96ูà¸\81à¸\82ัà¸\94à¸\88ัà¸
  msgid "Not locked"
  msgstr "ไม่ได้ล็อคอยู่"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "แฟ้ม %s ไม่ได้ขึ้นต้นด้วยการระบุการเซ็นกำกับครอบในตัวข้อความ"
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... เสร็จแล้ว"
+ 
  #~ msgid "Failed to remove %s"
  #~ msgstr "ไม่สามารถลบ %s"
  

diff --cc po/tl.po
index dd7081ca7379c362d2868f908ddc429787009e93,fd21cdeebc1334c4c97dc7a285bee248a5e99c78..56b58923c9b993fbb273452a1ae106d7ee88e585
--- 1/po/tl.po
--- 2/po/tl.po
+++ b/po/tl.po
@@@ -3450,6 -3447,6 +3450,14 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Tapos"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Binubuksan ang talaksang pagsasaayos %s"

diff --cc po/uk.po
index b521dd3fb05b2875dadece5b2b1ffc2da0644815,0dac6fb6d0596a87c29dd7f245ebe6e6419bb0b7..13928dc96766584e3cde9ecff898481fa1f7d28b
--- 1/po/uk.po
--- 2/po/uk.po
+++ b/po/uk.po
@@@ -3548,6 -3543,9 +3548,15 @@@ msgstr "
  msgid "Not locked"
  msgstr "Не заблоковано"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "Файл %s починається з не 'clearsigned' повідомленням"
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr ""
++#~ "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Виконано"
+ 
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Пропускається неіснуючий файл %s"
  

diff --cc po/vi.po
index 4d1995033e3b2cddf3f8a45253d9229e699ff8d8,ec6fdc6fcf00c3c7b51ea0df657ec0bd09493bb2..e0c0cefea708d5fe7ec1dfcb742195b28a693714
--- 1/po/vi.po
--- 2/po/vi.po
+++ b/po/vi.po
@@@ -3523,6 -3519,9 +3523,14 @@@ msgstr "dpkg bị gián đoạn, bạn 
  msgid "Not locked"
  msgstr "Chưa được khoá"
  
 -#~ msgid "File %s doesn't start with a clearsigned message"
 -#~ msgstr "Tập tin %s không bắt đầu bằng một đoạn chữ ký (gpg)"
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ “%s:%s” (%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... Hoàn tất"
+ 
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "Đang bỏ qua tập tin không tồn tại %s"
  

diff --cc po/zh_CN.po
index 1c52d991e4088c47dc2afc8fa0ab79f599df5348,b5e3a8c2af20a485cbb786627348dc999e6fef02..0c7f88d90f80d9700e7b658941ab81608f03cb09
--- 1/po/zh_CN.po
--- 2/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -3387,6 -3383,6 +3387,14 @@@ msgstr "dpkg 被中æ\96­ï¼\8cæ\82¨å¿\85é¡»æ\89\8bå·
  msgid "Not locked"
  msgstr "未锁定"
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "解析“%s:%s”时，出现了某些故障(%i - %s)"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... 完成"
++
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "跳过不存在的文件 %s"
  

diff --cc po/zh_TW.po
index e388bdcc36605751c1748424364b8d98dedfd6f8,31d72e55347a761b63dd3ff248703b6ef27bf8b7..5a6be9cca747b872733056a4dfb3e661f3017960
--- 1/po/zh_TW.po
--- 2/po/zh_TW.po
+++ b/po/zh_TW.po
@@@ -3373,6 -3369,6 +3373,14 @@@ msgstr "
  msgid "Not locked"
  msgstr ""
  
++#, fuzzy
++#~ msgid "System error resolving '%s:%s'"
++#~ msgstr "在解析 '%s:%s' (%i) 時出了怪事"
++
++#, fuzzy
++#~ msgid "%c%s... %u%%"
++#~ msgstr "%c%s... 完成"
++
  #, fuzzy
  #~ msgid "Skipping nonexistent file %s"
  #~ msgstr "開啟設定檔 %s"

diff --cc test/integration/framework
Simple merge

diff --cc test/libapt/makefile
index 578f2da4d2de98c4f49760b6dd07e4d26c7855ba,953e455e0498078b1c0a1eaeed415bdb84c3a420..969d6e2d9cd43da250ececdfbc038f4e57c8de4e
--- 1/test/libapt/makefile
--- 2/test/libapt/makefile
+++ b/test/libapt/makefile
@@@ -97,9 -97,11 +97,16 @@@ include $(PROGRAM_H
  PROGRAM = IndexCopyToSourceList${BASENAME}
  SLIBS = -lapt-pkg
  SOURCE = indexcopytosourcelist_test.cc
 +
 +# test fileutls
 +PROGRAM = FileUtl${BASENAME}
 +SLIBS = -lapt-pkg 
 +SOURCE = fileutl_test.cc
  include $(PROGRAM_H)
+ 
+ # test tagfile
+ PROGRAM = PkgTagFile${BASENAME}
+ SLIBS = -lapt-pkg
+ SOURCE = tagfile_test.cc
+ include $(PROGRAM_H)
+