* 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/sl.po b/po/sl.po
index 34dc0d6c2..2147c6f53 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,7 +4,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-16 22:18+0100\n"
 "Last-Translator: Jure Čuhalev <gandalf@owca.info>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -319,6 +319,7 @@ msgid "Error processing contents %s"
 msgstr "Napaka pri obdelavi vsebine %s"
 
 #: ftparchive/apt-ftparchive.cc:551
+#, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -357,7 +358,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 ""
 "Uporaba: apt-ftparchive [možnosti] ukaz\n"
 "Ukazi: packages binarypath [overridefile [pathprefix]]\n"
@@ -1532,7 +1533,7 @@ msgid "Internal error adding a diversion"
 msgstr "Notranja napaka pri dodajanju odklona"
 
 #: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+msgid "The pkg cache must be initialized first"
 msgstr "Najprej se mora izvesti predpomnilnik paketov"
 
 #: apt-inst/deb/dpkgdb.cc:386
@@ -2358,37 +2359,37 @@ msgstr "Predpomnilnik ima neustrezen sistem različic"
 
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format
-msgid "Error occured while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Prišlo je do napake pri obdelavi %s (Nov paket)"
 
 #: apt-pkg/pkgcachegen.cc:129
 #, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Prišlo je do napake pri obdelavi %s (Uporabi paket 1)"
 
 #: apt-pkg/pkgcachegen.cc:150
 #, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Prišlo je do napake pri obdelavi %s (Uporabi paket 2)"
 
 #: apt-pkg/pkgcachegen.cc:154
 #, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Prišlo je do napake pri obdelavi %s (Nova različica datoteke 1)"
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion1)"
 msgstr "Prišlo je do napake pri obdelavi %s (Nova različica 1)"
 
 #: apt-pkg/pkgcachegen.cc:188
 #, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Prišlo je do napake pri obdelavi %s (Uporabi paket 3)"
 
 #: apt-pkg/pkgcachegen.cc:192
 #, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+msgid "Error occurred while processing %s (NewVersion2)"
 msgstr "Prišlo je do napake pri obdelavi %s (Nova različica 2)"
 
 #: apt-pkg/pkgcachegen.cc:207
@@ -2405,12 +2406,12 @@ msgstr "Uau, presegli ste število odvisnosti, ki jih zmore APT."
 
 #: apt-pkg/pkgcachegen.cc:241
 #, c-format
-msgid "Error occured while processing %s (FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Prišlo je do napake pri obdelavi %s  (Najdi paket)"
 
 #: apt-pkg/pkgcachegen.cc:254
 #, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Prišlo je do napake pri obdelavi %s (Zberi dobavitelje datotek)"
 
 #: apt-pkg/pkgcachegen.cc:260