* merged apt--main and make sure that the po files come from apt--main (because they are more recent)

1 files changed, 13 insertions, 12 deletions

diff --git a/po/pl.po b/po/pl.po
index fb351d4f5..26a5239b7 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: 2005-03-05 22:10+0100\n"
+"POT-Creation-Date: 2005-03-29 07:17+0200\n"
 "PO-Revision-Date: 2005-02-11 11:47+0100\n"
 "Last-Translator: Bartosz Fenski <fenio@debian.org>\n"
 "Language-Team: Polish <pddp@debian.linux.org.pl>\n"
@@ -325,6 +325,7 @@ msgid "Error processing contents %s"
 msgstr "Błąd przy przetwarzaniu zawartości %s"
 
 #: ftparchive/apt-ftparchive.cc:551
+#, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -363,7 +364,7 @@ msgid ""
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitary configuration option"
+"  -o=?  Set an arbitrary configuration option"
 msgstr ""
 "Użycie: apt-ftparchive [opcje] polecenie\n"
 "Polecenia: packages ścieżka_do_binariów [plik_override [przedrostek]]\n"
@@ -1551,7 +1552,7 @@ msgid "Internal error adding a diversion"
 msgstr "Błąd wewnętrzny przy dodawaniu objazdu"
 
 #: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+msgid "The pkg cache must be initialized first"
 msgstr "Magazyn podręczny pakietów musi wcześniej zostać zainicjalizowany"
 
 #: apt-inst/deb/dpkgdb.cc:386
@@ -2379,37 +2380,37 @@ msgstr "Magazyn podręczny ma niezgodny system wersji"
 
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format
-msgid "Error occured while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Wystąpił błąd przy przetwarzaniu %s (NewPackage)"
 
 #: apt-pkg/pkgcachegen.cc:129
 #, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Wystąpił błąd przy przetwarzaniu %s (UsePackage1)"
 
 #: apt-pkg/pkgcachegen.cc:150
 #, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Wystąpił błąd przy przetwarzaniu %s (UsePackage2)"
 
 #: apt-pkg/pkgcachegen.cc:154
 #, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Wystąpił błąd przy przetwarzaniu %s (NewFileVer1)"
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion1)"
 msgstr "Wystąpił błąd przy przetwarzaniu %s (NewVersion1)"
 
 #: apt-pkg/pkgcachegen.cc:188
 #, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Wystąpił błąd przy przetwarzaniu %s (UsePackage3)"
 
 #: apt-pkg/pkgcachegen.cc:192
 #, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+msgid "Error occurred while processing %s (NewVersion2)"
 msgstr "Wystąpił błąd przy przetwarzaniu %s (NewVersion2)"
 
 #: apt-pkg/pkgcachegen.cc:207
@@ -2430,12 +2431,12 @@ msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:241
 #, c-format
-msgid "Error occured while processing %s (FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Wystąpił błąd przy przetwarzaniu %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:254
 #, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Wystąpił błąd przy przetwarzaniu %s (CollectFileProvides)"
 
 #: apt-pkg/pkgcachegen.cc:260