* merged the no-pragma branch

[apt.git] / po / apt-all.pot

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 90da191191c251584a2cea819878aeff88a880e6..d11b801234fae9c78096879283166d6df02ddbb3 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -1514,11 +1514,12 @@ msgstr ""
 
 #: 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 ""
 


@@ -1765,12 +1766,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 ""


@@ -1917,12 +1918,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 ""


@@ -2054,107 +2055,109 @@ 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 ""
 
 msgid "Depends"
 msgstr ""
 

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

 msgid "PreDepends"
 msgstr ""
 
 msgid "PreDepends"
 msgstr ""
 

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

 msgid "Suggests"
 msgstr ""
 
 msgid "Suggests"
 msgstr ""
 

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

 msgid "Recommends"
 msgstr ""
 
 msgid "Recommends"
 msgstr ""
 

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

 msgid "Conflicts"
 msgstr ""
 
 msgid "Conflicts"
 msgstr ""
 

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

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

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

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

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

 msgid "important"
 msgstr ""
 
 msgid "important"
 msgstr ""
 

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

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

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

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

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

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

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

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

-#: 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 ""
 
 msgid "Building dependency tree"
 msgstr ""
 

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

 msgid "Candidate versions"
 msgstr ""
 
 msgid "Candidate versions"
 msgstr ""
 

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

 msgid "Dependency generation"
 msgstr ""
 
 #: apt-pkg/depcache.cc:152 apt-pkg/depcache.cc:171 apt-pkg/depcache.cc:175
 msgid "Dependency generation"
 msgstr ""
 
 #: 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

 msgid "Reading state information"
 msgstr ""
 
 msgid "Reading state information"
 msgstr ""
 

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

 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr ""
 

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

 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
 

-#: 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 ""


@@ -2599,3 +2602,7 @@ msgstr ""
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr ""
 #: methods/rsh.cc:330
 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 ""