merged from the debian-sid branch

1 files changed, 79 insertions, 109 deletions

diff --git a/po/sl.po b/po/sl.po
index cd47abf85..3dd53fbda 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: apt 0.5.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:16+0000\n"
+"PO-Revision-Date: 2012-06-27 21:29+0000\n"
 "Last-Translator: Andrej Znidarsic <andrej.znidarsic@gmail.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "Language: sl\n"
@@ -14,8 +14,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
+"X-Launchpad-Export-Date: 2012-06-25 20:00+0000\n"
+"X-Generator: Launchpad (build 15482)\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -3481,44 +3481,17 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
 msgid "Not locked"
 msgstr "Ni zaklenjeno"
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Dobljena je ena vrstica glave preko %u znakov"
-
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Ni mogoče spremeniti v %s"
-
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Napačna izbira ConfFile v datoteki stanja. Odmik %lu"
-
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Datoteka z odklonom je pokvarjena"
-
-#~ msgid "Failed to open the diversions file %sdiversions"
-#~ msgstr "Odpiranje datoteke z odklonom %sdiversions ni uspelo"
-
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Branje datoteke s seznamom %sinfo/%s ni uspelo"
-
-#~ msgid "Reading file listing"
-#~ msgstr "Branje seznama datotek"
-
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Določitev %sinfo ni uspela"
-
-#~ msgid "Unable to create %s"
-#~ msgstr "Ni mogoče ustvariti %s"
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Preskok neobstoječe datoteke %s"
 
 #~ msgid "Failed to remove %s"
 #~ msgstr "Odstranitev %s ni uspela"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Paket %s ni nameščen, zato ni odstranjen\n"
-
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Opomba: To je dpkg storil samodejno in namenoma."
+#~ msgid "Unable to create %s"
+#~ msgstr "Ni mogoče ustvariti %s"
 
-#~ msgid "Use 'apt-get autoremove' to remove them."
-#~ msgstr "Uporabite 'apt-get autoremove' za njihovo odstranitev."
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Določitev %sinfo ni uspela"
 
 #~ msgid "The info and temp directories need to be on the same filesystem"
 #~ msgstr "Podatki in začasne mape morajo biti na istem datotečnem sistemu"
@@ -3529,6 +3502,9 @@ msgstr "Ni zaklenjeno"
 #~ msgid "Internal error getting a package name"
 #~ msgstr "Notranja napaka med dobivanjem imena paketa"
 
+#~ msgid "Reading file listing"
+#~ msgstr "Branje seznama datotek"
+
 #~ msgid ""
 #~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
 #~ "then make it empty and immediately re-install the same version of the "
@@ -3538,9 +3514,18 @@ msgstr "Ni zaklenjeno"
 #~ "obnoviti datoteke, jo izpraznite in takoj znova namestite enako različico "
 #~ "paketa!"
 
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Branje datoteke s seznamom %sinfo/%s ni uspelo"
+
 #~ msgid "Internal error getting a node"
 #~ msgstr "Notranja napaka med dobivanjem vozlišča"
 
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Odpiranje datoteke z odklonom %sdiversions ni uspelo"
+
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Datoteka z odklonom je pokvarjena"
+
 #~ msgid "Invalid line in the diversion file: %s"
 #~ msgstr "Neveljavna vrstica v datoteki z odklonom: %s"
 
@@ -3553,9 +3538,15 @@ msgstr "Ni zaklenjeno"
 #~ msgid "Failed to find a Package: header, offset %lu"
 #~ msgstr "Napaka med iskanjem paketa: glava, odmik %lu"
 
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Napačna izbira ConfFile v datoteki stanja. Odmik %lu"
+
 #~ msgid "Error parsing MD5. Offset %lu"
 #~ msgstr "Napaka med razčlenjevanjem MD5. Odmik %lu"
 
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Ni mogoče spremeniti v %s"
+
 #~ msgid "Failed to locate a valid control file"
 #~ msgstr "Ni mogoče najti veljavne nadzorne datoteke"
 
@@ -3565,81 +3556,60 @@ msgstr "Ni zaklenjeno"
 #~ msgid "Read error from %s process"
 #~ msgstr "Napaka med branjem iz opravila %s"
 
-#~ msgid ""
-#~ "Dynamic MMap ran out of room. Please increase the size of APT::Cache-"
-#~ "Limit. Current value: %lu. (man 5 apt.conf)"
-#~ msgstr ""
-#~ "Dinamičnemu MMap je zmanjkalo prostora. Povečajte velikost APT::Omejitev-"
-#~ "Predpomnilnika. Trenutna vrednost: %lu. (man 5 apt.conf)"
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Dobljena je ena vrstica glave preko %u znakov"
 
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Preskok neobstoječe datoteke %s"
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Napačno oblikovana prepisana vrstica %s %lu #1"
 
-#~ msgid ""
-#~ "Usage: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver is an interface to use the current internal\n"
-#~ "like an external resolver for the APT family for debugging or alike\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "apt.conf(5) manual pages for more information and options.\n"
-#~ "                       This APT has Super Cow Powers.\n"
-#~ msgstr ""
-#~ "Uporaba: apt-internal-resolver\n"
-#~ "\n"
-#~ "apt-internal-resolver je vmesnik za uporabo trenutnega notranjega\n"
-#~ "reševalnika kot zunanji reševalnik za družino APT za razhroščevanje ali "
-#~ "podobno.\n"
-#~ "\n"
-#~ "Možnosti:\n"
-#~ "  -h To besedilo pomoči\n"
-#~ "  -q Izhod se beleži - ni kazalnika napredka\n"
-#~ "  -c=? Prebere to nastavitveno datoteko\n"
-#~ "  -o=? Nastavi poljubno nastavitveno možnost, na primer dir::cache=/tmp\n"
-#~ "Oglejte si strani priročnika apt.conf(5) za več podrobnosti in možnosti.\n"
-#~ "                       Ta APT ima moči super krave.\n"
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Napačno oblikovana prepisana vrstica %s %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Napačno oblikovanje prepisane vrstice %s %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "program za razširjanje"
+
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "branje, še vedno %lu za branje, a nobeden ni ostal"
+
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "pisanje, še vedno %lu za pisanje, a ni mogoče"
+
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Nov paket)"
+
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 1)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Med obdelovanjem %s je prišlo do napake (NovOpisDatoteke1)"
+
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 2)"
+
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Nova različica datoteke 1)"
+
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Med obdelovanjem %s je prišlo do napake (NovaRazličica%d)"
+
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Uporabi paket 3)"
+
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Med obdelovanjem %s je prišlo do napake (NovOpisDatoteke2)"
+
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Prišlo je do napake med obdelavo %s  (Najdi paket)"
+
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Prišlo je do napake med obdelavo %s (Zberi dobavitelje datotek)"
 
 #~ msgid ""
-#~ "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
-#~ "\n"
-#~ "apt-mark is a simple command line interface for marking packages\n"
-#~ "as manual or automatical installed. It can also list marks.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ "   auto - Mark the given packages as automatically installed\n"
-#~ "   manual - Mark the given packages as manually installed\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "  -h  This help text.\n"
-#~ "  -q  Loggable output - no progress indicator\n"
-#~ "  -qq No output except for errors\n"
-#~ "  -s  No-act. Just prints what would be done.\n"
-#~ "  -f  read/write auto/manual marking in the given file\n"
-#~ "  -c=? Read this configuration file\n"
-#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See the apt-mark(8) and apt.conf(5) manual pages for more information."
+#~ "Could not perform immediate configuration on already unpacked '%s'. "
+#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
 #~ msgstr ""
-#~ "Uporaba: apt-mark [možnosti] {auto|manual} paket1 [paket2 ...]\n"
-#~ "\n"
-#~ "apt-mark je enostaven vmesnik ukazne vrstice za označevanje paketov\n"
-#~ "kot ročno ali samodejno nameščenih. Oznake lahko tudi izpiše.\n"
-#~ "\n"
-#~ "Ukazi:\n"
-#~ "   auto - Označi dane pakete kot samodejno nameščene\n"
-#~ "  manual - Označi dane pakete kot ročno nameščene\n"
-#~ "\n"
-#~ "Možnosti:\n"
-#~ "  -h To besedilo pomoči.\n"
-#~ "  -q Izhod se beleži - brez kazalnika napredka\n"
-#~ "  -qq Brez izhoda razen napak\n"
-#~ "  -s Ne naredi ničesar. Samo napiše kaj bi bilo narejeno.\n"
-#~ "  -f Prebere/zapiše oznako ročno/samodejno za dano datoteko\n"
-#~ "  -c=? Prebere to nastavitveno datoteko\n"
-#~ "  -o=? Nastavi poljubno nastavitveno možnost, na primer -o dir::cache=/"
-#~ "tmp\n"
-#~ "Za več podrobnosti si oglejte strani priročnika apt-mark(8) in apt-conf"
-#~ "(5)."
+#~ "Ni mogoče izvesti takojąnje nastavitve že razpakiranega '%s'. Oglejte si "
+#~ "man 5 apt.conf pod APT::Takojšnja-Nastavitev za podrobnosti"