* merged the no-pragma branch

[apt.git] / po / bs.po

diff --git a/po/bs.po b/po/bs.po
index 194f477028595e67c26c19c95ce2deefbfe6f15e..ab2cdbb1560508fcd7ca4aeee971b3f5acb1e4ba 100644 (file)
--- a/po/bs.po
+++ b/po/bs.po
@@ -1533,11 +1533,12 @@ msgstr "Datoteka nije pronađena"
 
 #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
 #: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
 
 #: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:133
 #: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243

+#: methods/gzip.cc:141 methods/gzip.cc:150

 msgid "Failed to stat"
 msgstr ""
 
 #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139
 msgid "Failed to stat"
 msgstr ""
 
 #: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:139

-#: methods/rred.cc:240
+#: methods/rred.cc:240 methods/gzip.cc:147

 msgid "Failed to set modification time"
 msgstr ""
 
 msgid "Failed to set modification time"
 msgstr ""
 


@@ -1786,12 +1787,12 @@ msgid ""
 "available:\n"
 msgstr ""
 
 "available:\n"
 msgstr ""
 

-#: methods/gzip.cc:57
+#: methods/gzip.cc:57 methods/gzip.cc:64

 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr ""
 

-#: methods/gzip.cc:102
+#: methods/gzip.cc:102 methods/gzip.cc:109

 #, c-format
 msgid "Read error from %s process"
 msgstr ""
 #, c-format
 msgid "Read error from %s process"
 msgstr ""


@@ -1938,12 +1939,12 @@ msgstr ""
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 

-#: apt-pkg/contrib/progress.cc:154
+#: apt-pkg/contrib/progress.cc:154 apt-pkg/contrib/progress.cc:155

 #, c-format
 msgid "%c%s... Error!"
 msgstr ""
 
 #, c-format
 msgid "%c%s... Error!"
 msgstr ""
 

-#: apt-pkg/contrib/progress.cc:156
+#: apt-pkg/contrib/progress.cc:156 apt-pkg/contrib/progress.cc:157

 #, c-format
 msgid "%c%s... Done"
 msgstr ""
 #, c-format
 msgid "%c%s... Done"
 msgstr ""


@@ -2075,109 +2076,111 @@ msgstr ""
 msgid "Problem syncing the file"
 msgstr ""
 
 msgid "Problem syncing the file"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:137
+#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:132

 msgid "Empty package cache"
 msgstr ""
 
 msgid "Empty package cache"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:138

 msgid "The package cache file is corrupted"
 msgstr ""
 
 msgid "The package cache file is corrupted"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:143

 msgid "The package cache file is an incompatible version"
 msgstr ""
 
 msgid "The package cache file is an incompatible version"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:148

 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:158
+#: apt-pkg/pkgcache.cc:158 apt-pkg/pkgcache.cc:153

 msgid "The package cache was built for a different architecture"
 msgstr ""
 
 msgid "The package cache was built for a different architecture"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:229
+#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224

 msgid "Depends"
 msgstr "Zavisi"
 
 msgid "Depends"
 msgstr "Zavisi"
 

-#: apt-pkg/pkgcache.cc:229
+#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224

 msgid "PreDepends"
 msgstr "Unaprijed zavisi"
 
 msgid "PreDepends"
 msgstr "Unaprijed zavisi"
 

-#: apt-pkg/pkgcache.cc:229
+#: apt-pkg/pkgcache.cc:229 apt-pkg/pkgcache.cc:224

 msgid "Suggests"
 msgstr "Predlaže"
 
 msgid "Suggests"
 msgstr "Predlaže"
 

-#: apt-pkg/pkgcache.cc:230
+#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225

 msgid "Recommends"
 msgstr "Preporučuje"
 
 msgid "Recommends"
 msgstr "Preporučuje"
 

-#: apt-pkg/pkgcache.cc:230
+#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225

 #, fuzzy
 msgid "Conflicts"
 msgstr "Sukobljava se sa"
 
 #, fuzzy
 msgid "Conflicts"
 msgstr "Sukobljava se sa"
 

-#: apt-pkg/pkgcache.cc:230
+#: apt-pkg/pkgcache.cc:230 apt-pkg/pkgcache.cc:225

 msgid "Replaces"
 msgstr "Zamjenjuje"
 
 msgid "Replaces"
 msgstr "Zamjenjuje"
 

-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:226

 msgid "Obsoletes"
 msgstr "Zastarijeva"
 
 msgid "Obsoletes"
 msgstr "Zastarijeva"
 

-#: apt-pkg/pkgcache.cc:242
+#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237

 msgid "important"
 msgstr "važno"
 
 msgid "important"
 msgstr "važno"
 

-#: apt-pkg/pkgcache.cc:242
+#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237

 msgid "required"
 msgstr "zahtijevano"
 
 msgid "required"
 msgstr "zahtijevano"
 

-#: apt-pkg/pkgcache.cc:242
+#: apt-pkg/pkgcache.cc:242 apt-pkg/pkgcache.cc:237

 msgid "standard"
 msgstr "standardno"
 
 msgid "standard"
 msgstr "standardno"
 

-#: apt-pkg/pkgcache.cc:243
+#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238

 msgid "optional"
 msgstr "opcionalno"
 
 msgid "optional"
 msgstr "opcionalno"
 

-#: apt-pkg/pkgcache.cc:243
+#: apt-pkg/pkgcache.cc:243 apt-pkg/pkgcache.cc:238

 msgid "extra"
 msgstr "extra"
 
 msgid "extra"
 msgstr "extra"
 

-#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130
+#: apt-pkg/depcache.cc:101 apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:98
+#: apt-pkg/depcache.cc:127

 msgid "Building dependency tree"
 msgstr "Gradim stablo zavisnosti"
 
 msgid "Building dependency tree"
 msgstr "Gradim stablo zavisnosti"
 

-#: apt-pkg/depcache.cc:102
+#: apt-pkg/depcache.cc:102 apt-pkg/depcache.cc:99

 msgid "Candidate versions"
 msgstr "Verzije kandidata"
 
 msgid "Candidate versions"
 msgstr "Verzije kandidata"
 

-#: apt-pkg/depcache.cc:131
+#: apt-pkg/depcache.cc:131 apt-pkg/depcache.cc:128

 msgid "Dependency generation"
 msgstr "Stvaranje zavisnosti"
 
 #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
 msgid "Dependency generation"
 msgstr "Stvaranje zavisnosti"
 
 #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175

+#: apt-pkg/depcache.cc:149 apt-pkg/depcache.cc:168 apt-pkg/depcache.cc:172

 #, fuzzy
 msgid "Reading state information"
 msgstr "Sastavljam dostupne informacije"
 
 #, fuzzy
 msgid "Reading state information"
 msgstr "Sastavljam dostupne informacije"
 

-#: apt-pkg/depcache.cc:199
+#: apt-pkg/depcache.cc:199 apt-pkg/depcache.cc:196

 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Ne mogu otvoriti %s"
 
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Ne mogu otvoriti %s"
 

-#: apt-pkg/depcache.cc:205
+#: apt-pkg/depcache.cc:205 apt-pkg/depcache.cc:202

 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Ne mogu ukloniti %s"
 
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Ne mogu ukloniti %s"
 

-#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92
+#: apt-pkg/tagfile.cc:85 apt-pkg/tagfile.cc:92 apt-pkg/tagfile.cc:106

 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 

-#: apt-pkg/tagfile.cc:186
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:193

 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""


@@ -2625,5 +2628,9 @@ msgstr ""
 msgid "Connection closed prematurely"
 msgstr ""
 
 msgid "Connection closed prematurely"
 msgstr ""
 

+#: apt-pkg/acquire-item.cc:1097
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+

 #~ msgid "File date has changed %s"
 #~ msgstr "Datum datoteke je promijenjen %s"
 #~ msgid "File date has changed %s"
 #~ msgstr "Datum datoteke je promijenjen %s"