From 0432d7310f8b2f356b116774c266744954d1667c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Jun 2005 16:37:00 +0000 Subject: * merged with otavios branch Patches applied: * apt@packages.debian.org/apt--main--0--patch-80 Merge michael.vogt@ubuntu.com--2005/apt--fixes--0 * apt@packages.debian.org/apt--main--0--patch-81 Open 0.6.37 * apt@packages.debian.org/apt--main--0--patch-82 merge bubulle@debian.org--2005/apt--main--0 * apt@packages.debian.org/apt--main--0--patch-83 Update changelog * apt@packages.debian.org/apt--main--0--patch-84 Fix build of French man pages (now using XML, not SGML) * apt@packages.debian.org/apt--main--0--patch-85 Merge patch from Philippe Batailler for French man page build * apt@packages.debian.org/apt--main--0--patch-86 add Welsh translations from Dafydd Harries * apt@packages.debian.org/apt--main--0--patch-87 Update changelog * apt@packages.debian.org/apt--misc-abi-changes--0--patch-4 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-5 Merge from mainline * apt@packages.debian.org/apt--misc-abi-changes--0--patch-6 Collapse both pkgAcquire::Run() methods into one, with a default value * bubulle@debian.org--2005/apt--main--0--patch-66 Italian translation complete * bubulle@debian.org--2005/apt--main--0--patch-67 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-68 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-69 Sync with Matt * bubulle@debian.org--2005/apt--main--0--patch-70 Re-generate the POT and PO files from sources * bubulle@debian.org--2005/apt--main--0--patch-71 Update French translation * bubulle@debian.org--2005/apt--main--0--patch-72 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-73 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-74 Hebres translation update * bubulle@debian.org--2005/apt--main--0--patch-75 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-76 Correct the Hebrew translation for #306658 * bubulle@debian.org--2005/apt--main--0--patch-77 Update French man pages translations * bubulle@debian.org--2005/apt--main--0--patch-78 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-79 Correct syntax errors in Hebrew translation * bubulle@debian.org--2005/apt--main--0--patch-80 Revert changes to debian/changelog and debian/apt.cron.daily * bubulle@debian.org--2005/apt--main--0--patch-81 Portuguese translation update * daf@muse.19inch.net--2005/apt--main--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-85 * daf@muse.19inch.net--2005/apt--main--0--patch-1 add Welsh translation * michael.vogt@ubuntu.com--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-1 * merged obvious fixes into the tree to make it easy for matt to merge * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-2 * more merges from otavio that looks good/uncritical * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-3 * merged Matts misc-abi-changes tree * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-4 * finalized the changelog for a ubuntu build * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-26 * fix the cache-control header generation * otavio@debian.org--2005/apt--ddtp--0.6--patch-18 Revert changes did by mistake on translation files. * otavio@debian.org--2005/apt--ddtp--0.6--patch-19 Merge last changes did from upstream side. * otavio@debian.org--2005/apt--ddtp--0.6--patch-20 Sync with apt--main--0--patch-87 * otavio@debian.org--2005/apt--fixes--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-71 * otavio@debian.org--2005/apt--fixes--0--patch-1 Fix comments about the need of xmlto * otavio@debian.org--2005/apt--fixes--0--patch-2 Fix a compile warning * otavio@debian.org--2005/apt--fixes--0--patch-3 Sync with apt--main--0--patch-76 * otavio@debian.org--2005/apt--fixes--0--patch-4 Sync with apt--main--0--patch-78 * otavio@debian.org--2005/apt--fixes--0--patch-5 Add fixes that was wrongly included on DDTP changes. * otavio@debian.org--2005/apt--fixes--0--patch-8 Add information about the other fixes include on this branch now. * otavio@debian.org--2005/apt--fixes--0--patch-9 Merge last changes from apt--main--0. * otavio@debian.org--2005/apt--fixes--0--patch-10 Fix warnings about min/max change in gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-11 Fix remaning warnings while compiling gcc-4.0 * otavio@debian.org--2005/apt--fixes--0--patch-12 Add changelog entry about the fixes for warnings while compiling using GCC 4.0 compiler. * philippe.batailler@free.fr--2005/apt--mainBubulle--0.1--patch-1 Passage sous arch * philippe.batailler@free.fr--2005/apt--mainMatt--0--patch-1 fix xml error --- po/sl.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'po/sl.po') 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 \n" "Language-Team: Slovenian \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 #: 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 #: 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 -- cgit v1.2.3