summaryrefslogtreecommitdiff
path: root/po/sl.po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-02-23 00:45:56 +0100
committerMichael Vogt <mvo@debian.org>2014-02-23 00:45:56 +0100
commiteccff323a093d91fff379e7c8460d7e5c8db8ad1 (patch)
treed539d21c6716af3122edabae91feadccfb3c12ad /po/sl.po
parent2c678b0a026ac9d44c8ade07aa8bf318faf5a9e2 (diff)
parentb7ed961b8099c05f65e18d4c73ead50cc5c8bff1 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'po/sl.po')
-rw-r--r--po/sl.po36
1 files changed, 17 insertions, 19 deletions
diff --git a/po/sl.po b/po/sl.po
index 108aedad2..721aae6d2 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: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-20 14:43+0100\n"
+"POT-Creation-Date: 2014-02-23 00:29+0100\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"
@@ -159,7 +159,7 @@ msgstr " Preglednica različic:"
#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
@@ -1741,12 +1741,7 @@ msgstr "nad tem sporočilom. Popravite jih in poženite Namest[I]tev še enkrat"
msgid "Merging available information"
msgstr "Združevanje razpoložljivih podaktov"
-#: cmdline/apt-extracttemplates.cc:100
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s ni veljaven paket DEB."
-
-#: cmdline/apt-extracttemplates.cc:234
+#: cmdline/apt-extracttemplates.cc:224
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1770,12 +1765,12 @@ msgstr ""
" -c=? Prebere podano datoteko z nastavitvami\n"
" -o=? Nastavi poljubno nastavitveno možnost, na primer. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Ni mogoče pisati na %s"
-#: cmdline/apt-extracttemplates.cc:308
+#: cmdline/apt-extracttemplates.cc:298
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ni mogoče ugotoviti različice debconfa. Je sploh nameščen?"
@@ -2149,23 +2144,23 @@ msgstr ""
" -c=? Prebere podano datoteko z nastavitvami\n"
" -o=? Nastavi poljubno nastavitveno možnost, npr. -o dir::cache=/tmp\n"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:122
msgid "Failed to create pipes"
msgstr "Ni mogoče ustvariti pip"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:149
msgid "Failed to exec gzip "
msgstr "Ni mogoče izvesti gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
+#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
msgid "Corrupted archive"
msgstr "Pokvarjen arhiv"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:201
msgid "Tar checksum failed, archive corrupted"
msgstr "Nadzorna vsota tar ni uspela, arhiv je pokvarjen"
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:306
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Neznana vrsta glave TAR %u, član %s"
@@ -2288,18 +2283,18 @@ msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s"
msgid "Unable to stat %s"
msgstr "Ni mogoče določiti %s"
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
-#: apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:57
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "To ni veljaven arhiv DEB. Manjka član '%s'."
-#: apt-inst/deb/debfile.cc:119
+#: apt-inst/deb/debfile.cc:124
#, c-format
msgid "Internal error, could not locate member %s"
msgstr "Notranja napaka. Ni mogoče najti člana %s."
-#: apt-inst/deb/debfile.cc:213
+#: apt-inst/deb/debfile.cc:219
msgid "Unparsable control file"
msgstr "Nadzorne datoteke ni mogoče razčleniti"
@@ -3546,6 +3541,9 @@ msgstr "dpkg je bil prekinjen. Za popravilo napake morate ročno pognati '%s'. "
msgid "Not locked"
msgstr "Ni zaklenjeno"
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "%s ni veljaven paket DEB."
+
#~ msgid ""
#~ "Using CD-ROM mount point %s\n"
#~ "Mounting CD-ROM\n"