* apt-pkg/deb/dpkgpm.cc:

  - apport integration added, this means that a apport
    report is written on dpkg failures
* merged from debian/unstable, remaining changes:
  - maintainer field changed

* merged the debian/experimental changes back
  into the debian/sid branch
* merged from Christian Perrier:
  * mr.po: New Marathi translation  Closes: #416806
  * zh_CN.po: Updated by Eric Pareja  Closes: #416822
  * tl.po: Updated by Eric Pareja   Closes: #416638
  * gl.po: Updated by Jacobo Tarrio
  * da.po: Updated by Claus Hindsgaul
  * fr.po: Remove a non-breakable space for usability
  * ru.po: Updated Russian translation. Closes: #405476
  * *.po: Unfuzzy after upstream typo corrections
* buildlib/archtable:
  - added support for sh3/sh4 (closes: #424870)
  - added support for m32r (closes: #394096)
* buildlib/systemtable:
  - added support for lpia
* configure.in:
  - check systemtable for architecture mapping too
* fix error in AutocleanInterval, closes: #319339
  (thanks to Israel G. Lugo for the patch)
* add "purge" commandline argument, closes: #133421)
  (thanks to Julien Danjou for the patch)
* add "purge" commandline argument, closes: #133421)
  (thanks to Julien Danjou for the patch)
* fix FTBFS with gcc 4.3, closes: #417090
  (thanks to Martin Michlmayr for the patch)
* add --dsc-only option, thanks to K. Richard Pixley
* Removed the more leftover #pragma interface/implementation
  closes: #306937 (thanks to Andreas Henriksson for the patch)

* ABI library name change because its build against
  new glibc
* implement SourceVer() in pkgRecords 
   (thanks to Daniel Burrows for the patch!)
* apt-pkg/algorithm.cc:
  - use clog for all debugging
  - only increase the score of installed applications if they 
    are not obsolete 
  - fix resolver bug on removal triggered by weak-dependencies 
    with or-groups
* methods/http.cc:
  - send apt version in User-Agent
* apt-pkg/deb/debrecords.cc:
  - fix SHA1Hash() return value
* apt-pkg/cdrom.cc:
  - only unmount if APT::CDROM::NoMount is false
* methods/cdrom.cc:  
  - only umount if it was mounted by the method before
  - if decompression of a index fails, delete the index 
  * vi.po: Updated to 515t. Closes: #426976
  * eu.po: Updated to 515t. Closes: #423766
  * pt.po: 515t. Closes: #423111
  * fr.po: Updated by Christian Perrier
  * Update all PO and the POT. Gives 513t2f for formerly
    complete translations
* Package that contains tall the new features
* Removed all #pragma interface/implementation
* Branch that contains tall the new features:
* translated package descriptions
* task install support
* automatic dependency removal (thanks to Daniel Burrows)
* merged support for the new dpkg "Breaks" field 
  (thanks to Ian Jackson)
* handle network failures more gracefully on "update"
* support for unattended-upgrades (via unattended-upgrades
  package)
* added apt-transport-https method
  - ca.po: Updated to 514t
  - be.po: Updated to 514t
  - it.po: Updated to 514t
  - hu.po: Updated to 514t
  - zh_TW.po: Updated to 514t
  - ar.po: Updated to 293t221u.
  - ru.po: Updated to 514t. Closes: #392466
  - nb.po: Updated to 514t. Closes: #392466
  - pt.po: Updated to 514t. Closes: #393199
  - fr.po: One spelling error corrected: s/accèder/accéder
  - km.po: Updated to 514t.
  - ko.po: Updated to 514t.
  - bg.po: Updated to 514t.
  - de.po: Updated to 514t.
  - en_GB.po: Updated to 514t.
* debian/control:
  - depend on debian-archive-keyring to offer clean upgrade path 
    (closes: #386800)
* merged "install-recommends" branch (ABI break): 
  - new "--install-recommends"
  - install new recommends on "upgrade" if --install-recommends is 
    given
  - new "--fix-policy" option to install all packages with unmet
    important dependencies (usefull with --install-recommends to
    see what not-installed recommends are on the system)
  - fix of recommended packages display (only show CandidateVersion
    fix or-group handling)
* merged "install-task" branch (use with "apt-get install taskname^")
* Applied patch from Daniel Schepler to make apt bin-NMU able.
* apt-pkg/acquire-item.cc:
  - fix reversed logic of the "Acquire::PDiffs" option
* apt-pkg/contrib/sha256.cc:
  - applied patch to fix unaligned access problem. Closes: #367417
    (thanks to David Mosberger)
* apt-pkg/contrib/sha256.{cc,h},hashes.{cc,h}: support for sha256 
  (thanks to Anthony Towns)
* ftparchive/cachedb.{cc,h},writer.{cc,h}: optimizations 
  (thanks to Anthony Towns)
* apt pdiff support from experimental merged
* apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
  - fix error in dpkg interaction (closes: #364513, thanks to Martin Dickopp)

1 files changed, 51 insertions, 45 deletions

diff --git a/po/pl.po b/po/pl.po
index 4518418ae..763ec3325 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"POT-Creation-Date: 2007-05-08 11:03+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"
@@ -1672,16 +1672,16 @@ msgstr ""
 msgid "Wrong CD-ROM"
 msgstr "Niew³a¶ciwa p³yta CD"
 
-#: methods/cdrom.cc:164
+#: methods/cdrom.cc:166
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "Nie uda³o siê odmontowaæ CD-ROM-u w %s, byæ mo¿e wci±¿ jest u¿ywany."
 
-#: methods/cdrom.cc:169
+#: methods/cdrom.cc:171
 msgid "Disk not found."
 msgstr "Nie odnaleziono dysku."
 
-#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
 msgid "File not found"
 msgstr "Nie odnaleziono pliku"
 
@@ -1819,7 +1819,7 @@ msgstr "Przekroczony czas po³±czenia gniazda danych"
 msgid "Unable to accept connection"
 msgstr "Nie uda³o siê przyj±æ po³±czenia"
 
-#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Nie uda³o siê obliczyæ skrótu pliku"
 
@@ -1954,76 +1954,76 @@ msgstr "Nie uda³o siê otworzyæ potoku dla %s"
 msgid "Read error from %s process"
 msgstr "B³±d odczytu z procesu %s"
 
-#: methods/http.cc:376
+#: methods/http.cc:377
 msgid "Waiting for headers"
 msgstr "Oczekiwanie na nag³ówki"
 
-#: methods/http.cc:522
+#: methods/http.cc:523
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Otrzymano pojedyncz± liniê nag³ówka o d³ugo¶ci ponad %u znaków"
 
-#: methods/http.cc:530
+#: methods/http.cc:531
 msgid "Bad header line"
 msgstr "Nieprawid³owa linia nag³ówka"
 
-#: methods/http.cc:549 methods/http.cc:556
+#: methods/http.cc:550 methods/http.cc:557
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek odpowiedzi"
 
-#: methods/http.cc:585
+#: methods/http.cc:586
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek Content-Length"
 
-#: methods/http.cc:600
+#: methods/http.cc:601
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Serwer HTTP przys³a³ nieprawid³owy nag³ówek Content-Range"
 
-#: methods/http.cc:602
+#: methods/http.cc:603
 msgid "This HTTP server has broken range support"
 msgstr "Ten serwer HTTP nieprawid³owo obs³uguje zakresy (ranges)"
 
-#: methods/http.cc:626
+#: methods/http.cc:627
 msgid "Unknown date format"
 msgstr "Nieznany format daty"
 
-#: methods/http.cc:773
+#: methods/http.cc:774
 msgid "Select failed"
 msgstr "Operacja select nie powiod³a siê"
 
-#: methods/http.cc:778
+#: methods/http.cc:779
 msgid "Connection timed out"
 msgstr "Przekroczenie czasu po³±czenia"
 
-#: methods/http.cc:801
+#: methods/http.cc:802
 msgid "Error writing to output file"
 msgstr "B³±d przy pisaniu do pliku wyj¶ciowego"
 
-#: methods/http.cc:832
+#: methods/http.cc:833
 msgid "Error writing to file"
 msgstr "B³±d przy pisaniu do pliku"
 
-#: methods/http.cc:860
+#: methods/http.cc:861
 msgid "Error writing to the file"
 msgstr "B³±d przy pisaniu do pliku"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error reading from server. Remote end closed connection"
 msgstr "B³±d czytania z serwera: Zdalna strona zamknê³a po³±czenie"
 
-#: methods/http.cc:876
+#: methods/http.cc:877
 msgid "Error reading from server"
 msgstr "B³±d czytania z serwera"
 
-#: methods/http.cc:1107
+#: methods/http.cc:1108
 msgid "Bad header data"
 msgstr "B³êdne dane nag³ówka"
 
-#: methods/http.cc:1124
+#: methods/http.cc:1125
 msgid "Connection failed"
 msgstr "Po³±czenie nie uda³o siê"
 
-#: methods/http.cc:1215
+#: methods/http.cc:1216
 msgid "Internal error"
 msgstr "B³±d wewnêtrzny"
 
@@ -2097,12 +2097,12 @@ msgstr "B³±d sk³adniowy %s:%u: Nieobs³ugiwana dyrektywa '%s'"
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "B³±d sk³adniowy %s:%u: ¦mieci na koñcu pliku"
 
-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:155
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... B³±d!"
 
-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:157
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Gotowe"
@@ -2399,7 +2399,7 @@ msgid ""
 msgstr ""
 "Pakiet %s ma zostaæ przeinstalowany, ale nie mo¿na znale¼æ jego archiwum."
 
-#: apt-pkg/algorithms.cc:1059
+#: apt-pkg/algorithms.cc:1066
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2407,7 +2407,7 @@ msgstr ""
 "B³±d, pkgProblemResolver::Resolve zwróci³ b³±d, mo¿e to byæ spowodowane "
 "\"zatrzymanymi\" pakietami."
 
-#: apt-pkg/algorithms.cc:1061
+#: apt-pkg/algorithms.cc:1068
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Nie uda³o siê naprawiæ problemów, zatrzymano uszkodzone pakiety."
 
@@ -2423,12 +2423,12 @@ msgstr "Brakuje katalogu archiwów %spartial."
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:823
+#: apt-pkg/acquire.cc:830
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "Pobieranie pliku %li z %li (%s pozosta³o)"
 
-#: apt-pkg/acquire.cc:825
+#: apt-pkg/acquire.cc:832
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Czytanie listy plików"
@@ -2474,16 +2474,16 @@ msgstr "Nie uda³o siê otworzyæ lub zanalizowaæ zawarto¶ci list pakietów."
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Nale¿y uruchomiæ apt-get update aby naprawiæ te problemy."
 
-#: apt-pkg/policy.cc:269
+#: apt-pkg/policy.cc:270
 msgid "Invalid record in the preferences file, no Package header"
 msgstr "Nieprawid³owy rekord w pliku ustawieñ, brak nag³ówka Package"
 
-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:292
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Nierozpoznany typ przypinania %s"
 
-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:300
 msgid "No priority (or zero) specified for pin"
 msgstr "Brak (lub zerowy) priorytet przypiêcia"
 
@@ -2574,16 +2574,16 @@ msgstr "B³±d wej¶cia/wyj¶cia przy zapisywaniu podrêcznego magazynu ¼róde³"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "nie uda³o siê zmieniæ nazwy, %s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
 msgid "MD5Sum mismatch"
 msgstr "B³êdna suma MD5"
 
-#: apt-pkg/acquire-item.cc:640
+#: apt-pkg/acquire-item.cc:647
 #, fuzzy
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Dla nastêpuj±cego identyfikatora klucza brakuje klucza publicznego:\n"
 
-#: apt-pkg/acquire-item.cc:753
+#: apt-pkg/acquire-item.cc:760
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2592,7 +2592,7 @@ msgstr ""
 "Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba "
 "bêdzie rêcznie naprawiæ ten pakiet (z powodu brakuj±cej architektury)."
 
-#: apt-pkg/acquire-item.cc:812
+#: apt-pkg/acquire-item.cc:819
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2601,14 +2601,14 @@ msgstr ""
 "Nie uda³o siê odnale¼æ pliku dla pakietu %s. Mo¿e to oznaczaæ, ¿e trzeba "
 "bêdzie rêcznie naprawiæ ten pakiet."
 
-#: apt-pkg/acquire-item.cc:848
+#: apt-pkg/acquire-item.cc:855
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Pliki indeksu pakietów s± uszkodzone. Brak pola Filename: dla pakietu %s."
 
-#: apt-pkg/acquire-item.cc:935
+#: apt-pkg/acquire-item.cc:942
 msgid "Size mismatch"
 msgstr "B³êdny rozmiar"
 
@@ -2664,11 +2664,16 @@ msgstr ""
 "Znaleziono %i indeksów pakietów, %i indeksów ¼ród³owych, %i indeksów "
 "t³umaczeñ i %i sygnatur\n"
 
-#: apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:683
+#, fuzzy, c-format
+msgid "Found label '%s'\n"
+msgstr "Etykieta: %s \n"
+
+#: apt-pkg/cdrom.cc:712
 msgid "That is not a valid name, try again.\n"
 msgstr "To nie jest prawid³owa nazwa, spróbuj ponownie.\n"
 
-#: apt-pkg/cdrom.cc:726
+#: apt-pkg/cdrom.cc:728
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -2677,20 +2682,21 @@ msgstr ""
 "P³yta nosi nazwê: \n"
 "'%s'\n"
 
-#: apt-pkg/cdrom.cc:730
+#: apt-pkg/cdrom.cc:732
 msgid "Copying package lists..."
 msgstr "Kopiowanie list pakietów..."
 
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:756
 msgid "Writing new source list\n"
 msgstr "Zapisywanie nowej listy ¼róde³\n"
 
-#: apt-pkg/cdrom.cc:763
+#: apt-pkg/cdrom.cc:765
 msgid "Source list entries for this disc are:\n"
 msgstr "¬ród³a dla tej p³yty to:\n"
 
-#: apt-pkg/cdrom.cc:803
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/cdrom.cc:807
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
 msgstr "Odmontowanie CD-ROMu..."
 
 #: apt-pkg/indexcopy.cc:261