summaryrefslogtreecommitdiff
path: root/po/bs.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/bs.po
parent2c678b0a026ac9d44c8ade07aa8bf318faf5a9e2 (diff)
parentb7ed961b8099c05f65e18d4c73ead50cc5c8bff1 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'po/bs.po')
-rw-r--r--po/bs.po36
1 files changed, 17 insertions, 19 deletions
diff --git a/po/bs.po b/po/bs.po
index 510d0b56b..b5d611697 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.26\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: 2004-05-06 15:25+0100\n"
"Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -157,7 +157,7 @@ msgstr ""
#: 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"
@@ -1578,12 +1578,7 @@ msgstr ""
msgid "Merging available information"
msgstr "Sastavljam dostupne informacije"
-#: cmdline/apt-extracttemplates.cc:100
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "%s nije ispravan DEB paket."
-
-#: cmdline/apt-extracttemplates.cc:234
+#: cmdline/apt-extracttemplates.cc:224
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1597,12 +1592,12 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: 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 "Ne mogu zapisati na %s"
-#: cmdline/apt-extracttemplates.cc:308
+#: cmdline/apt-extracttemplates.cc:298
msgid "Cannot get debconf version. Is debconf installed?"
msgstr ""
"Ne mogu odrediti verziju debconf programa. Da li je debconf instaliran?"
@@ -1915,23 +1910,23 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:122
msgid "Failed to create pipes"
msgstr ""
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:149
msgid "Failed to exec gzip "
msgstr "Ne mogu izvršiti 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 "Oštećena arhiva"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:201
msgid "Tar checksum failed, archive corrupted"
msgstr "Provjera Tar kontrolnog zbira nije uspjela, arhiva oštećena"
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:306
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr ""
@@ -2054,18 +2049,18 @@ msgstr ""
msgid "Unable to stat %s"
msgstr ""
-#: 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 ""
-#: apt-inst/deb/debfile.cc:119
+#: apt-inst/deb/debfile.cc:124
#, c-format
msgid "Internal error, could not locate member %s"
msgstr ""
-#: apt-inst/deb/debfile.cc:213
+#: apt-inst/deb/debfile.cc:219
msgid "Unparsable control file"
msgstr ""
@@ -3261,6 +3256,9 @@ msgstr ""
msgid "Not locked"
msgstr ""
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "%s nije ispravan DEB paket."
+
#, fuzzy
#~ msgid " [Not candidate version]"
#~ msgstr "Verzije kandidata"