Browse Source

* don't throw any more warnings

debian/1.8.y
Michael Vogt 17 years ago
parent
commit
11680bfd38
  1. 8
      apt-pkg/deb/debindexfile.cc
  2. 2
      apt-pkg/deb/debindexfile.h
  3. 2
      configure.in
  4. 182
      po/apt-all.pot

8
apt-pkg/deb/debindexfile.cc

@ -401,6 +401,14 @@ string debTranslationsIndex::Info(const char *Type) const
return Info;
}
/*}}}*/
bool debTranslationsIndex::HasPackages() const
{
if(!UseTranslation())
return false;
return FileExists(IndexFile(LanguageCode().c_str()));
}
// TranslationsIndex::Exists - Check if the index is available /*{{{*/
// ---------------------------------------------------------------------
/* */

2
apt-pkg/deb/debindexfile.h

@ -96,7 +96,7 @@ class debTranslationsIndex : public pkgIndexFile
// Interface for the Cache Generator
virtual bool Exists() const;
virtual bool HasPackages() const { return UseTranslation();};
virtual bool HasPackages() const;
virtual unsigned long Size() const;
virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const;
virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;

2
configure.in

@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
AC_DEFINE_UNQUOTED(VERSION,"0.6.35ubuntu1")
AC_DEFINE_UNQUOTED(VERSION,"0.6.36os1")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)

182
po/apt-all.pot

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-03-06 12:50+0100\n"
"POT-Creation-Date: 2005-05-13 19:54+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -15,145 +15,153 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: cmdline/apt-cache.cc:135
#: cmdline/apt-cache.cc:141
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr ""
#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
#: cmdline/apt-cache.cc:1508
#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
#: cmdline/apt-cache.cc:1401 cmdline/apt-cache.cc:1552
#, c-format
msgid "Unable to locate package %s"
msgstr ""
#: cmdline/apt-cache.cc:232
#: cmdline/apt-cache.cc:245
msgid "Total package names : "
msgstr ""
#: cmdline/apt-cache.cc:272
#: cmdline/apt-cache.cc:285
msgid " Normal packages: "
msgstr ""
#: cmdline/apt-cache.cc:273
#: cmdline/apt-cache.cc:286
msgid " Pure virtual packages: "
msgstr ""
#: cmdline/apt-cache.cc:274
#: cmdline/apt-cache.cc:287
msgid " Single virtual packages: "
msgstr ""
#: cmdline/apt-cache.cc:275
#: cmdline/apt-cache.cc:288
msgid " Mixed virtual packages: "
msgstr ""
#: cmdline/apt-cache.cc:276
#: cmdline/apt-cache.cc:289
msgid " Missing: "
msgstr ""
#: cmdline/apt-cache.cc:278
#: cmdline/apt-cache.cc:291
msgid "Total distinct versions: "
msgstr ""
#: cmdline/apt-cache.cc:280
#: cmdline/apt-cache.cc:293
msgid "Total Distinct Descriptions: "
msgstr ""
#: cmdline/apt-cache.cc:295
msgid "Total dependencies: "
msgstr ""
#: cmdline/apt-cache.cc:283
#: cmdline/apt-cache.cc:298
msgid "Total ver/file relations: "
msgstr ""
#: cmdline/apt-cache.cc:285
#: cmdline/apt-cache.cc:300
msgid "Total Desc/File relations: "
msgstr ""
#: cmdline/apt-cache.cc:302
msgid "Total Provides mappings: "
msgstr ""
#: cmdline/apt-cache.cc:297
#: cmdline/apt-cache.cc:314
msgid "Total globbed strings: "
msgstr ""
#: cmdline/apt-cache.cc:311
#: cmdline/apt-cache.cc:328
msgid "Total dependency version space: "
msgstr ""
#: cmdline/apt-cache.cc:316
#: cmdline/apt-cache.cc:333
msgid "Total slack space: "
msgstr ""
#: cmdline/apt-cache.cc:324
#: cmdline/apt-cache.cc:341
msgid "Total space accounted for: "
msgstr ""
#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
#, c-format
msgid "Package file %s is out of sync."
msgstr ""
#: cmdline/apt-cache.cc:1231
#: cmdline/apt-cache.cc:1275
msgid "You must give exactly one pattern"
msgstr ""
#: cmdline/apt-cache.cc:1385
#: cmdline/apt-cache.cc:1429
msgid "No packages found"
msgstr ""
#: cmdline/apt-cache.cc:1462
#: cmdline/apt-cache.cc:1506
msgid "Package files:"
msgstr ""
#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
#: cmdline/apt-cache.cc:1513 cmdline/apt-cache.cc:1599
msgid "Cache is out of sync, can't x-ref a package file"
msgstr ""
#: cmdline/apt-cache.cc:1470
#: cmdline/apt-cache.cc:1514
#, c-format
msgid "%4i %s\n"
msgstr ""
#. Show any packages have explicit pins
#: cmdline/apt-cache.cc:1482
#: cmdline/apt-cache.cc:1526
msgid "Pinned packages:"
msgstr ""
#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
#: cmdline/apt-cache.cc:1538 cmdline/apt-cache.cc:1579
msgid "(not found)"
msgstr ""
#. Installed version
#: cmdline/apt-cache.cc:1515
#: cmdline/apt-cache.cc:1559
msgid " Installed: "
msgstr ""
#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1569
msgid "(none)"
msgstr ""
#. Candidate Version
#: cmdline/apt-cache.cc:1522
#: cmdline/apt-cache.cc:1566
msgid " Candidate: "
msgstr ""
#: cmdline/apt-cache.cc:1532
#: cmdline/apt-cache.cc:1576
msgid " Package pin: "
msgstr ""
#. Show the priority tables
#: cmdline/apt-cache.cc:1541
#: cmdline/apt-cache.cc:1585
msgid " Version table:"
msgstr ""
#: cmdline/apt-cache.cc:1556
#: cmdline/apt-cache.cc:1600
#, c-format
msgid " %4i %s\n"
msgstr ""
#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-cache.cc:1695 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr ""
#: cmdline/apt-cache.cc:1658
#: cmdline/apt-cache.cc:1702
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@ -231,7 +239,7 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:806
#, c-format
msgid "Unable to write to %s"
msgstr ""
@ -303,7 +311,7 @@ msgid ""
" --no-delink Enable delinking debug mode\n"
" --contents Control contents file generation\n"
" -c=? Read this configuration file\n"
" -o=? Set an arbitary configuration option"
" -o=? Set an arbitrary configuration option"
msgstr ""
#: ftparchive/apt-ftparchive.cc:757
@ -1301,9 +1309,9 @@ msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
#. Build the status cache
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
#: apt-pkg/pkgcachegen.cc:840
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:739
#: apt-pkg/pkgcachegen.cc:808 apt-pkg/pkgcachegen.cc:813
#: apt-pkg/pkgcachegen.cc:936
msgid "Reading package lists"
msgstr ""
@ -1741,7 +1749,7 @@ msgstr ""
msgid "Couldn't make mmap of %lu bytes"
msgstr ""
#: apt-pkg/contrib/strutl.cc:941
#: apt-pkg/contrib/strutl.cc:984
#, c-format
msgid "Selection %s not found"
msgstr ""
@ -1938,72 +1946,72 @@ msgstr ""
msgid "Problem syncing the file"
msgstr ""
#: apt-pkg/pkgcache.cc:126
#: apt-pkg/pkgcache.cc:135
msgid "Empty package cache"
msgstr ""
#: apt-pkg/pkgcache.cc:132
#: apt-pkg/pkgcache.cc:141
msgid "The package cache file is corrupted"
msgstr ""
#: apt-pkg/pkgcache.cc:137
#: apt-pkg/pkgcache.cc:146
msgid "The package cache file is an incompatible version"
msgstr ""
#: apt-pkg/pkgcache.cc:142
#: apt-pkg/pkgcache.cc:151
#, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr ""
#: apt-pkg/pkgcache.cc:147
#: apt-pkg/pkgcache.cc:156
msgid "The package cache was built for a different architecture"
msgstr ""
#: apt-pkg/pkgcache.cc:218
#: apt-pkg/pkgcache.cc:227
msgid "Depends"
msgstr ""
#: apt-pkg/pkgcache.cc:218
#: apt-pkg/pkgcache.cc:227
msgid "PreDepends"
msgstr ""
#: apt-pkg/pkgcache.cc:218
#: apt-pkg/pkgcache.cc:227
msgid "Suggests"
msgstr ""
#: apt-pkg/pkgcache.cc:219
#: apt-pkg/pkgcache.cc:228
msgid "Recommends"
msgstr ""
#: apt-pkg/pkgcache.cc:219
#: apt-pkg/pkgcache.cc:228
msgid "Conflicts"
msgstr ""
#: apt-pkg/pkgcache.cc:219
#: apt-pkg/pkgcache.cc:228
msgid "Replaces"
msgstr ""
#: apt-pkg/pkgcache.cc:220
#: apt-pkg/pkgcache.cc:229
msgid "Obsoletes"
msgstr ""
#: apt-pkg/pkgcache.cc:231
#: apt-pkg/pkgcache.cc:240
msgid "important"
msgstr ""
#: apt-pkg/pkgcache.cc:231
#: apt-pkg/pkgcache.cc:240
msgid "required"
msgstr ""
#: apt-pkg/pkgcache.cc:231
#: apt-pkg/pkgcache.cc:240
msgid "standard"
msgstr ""
#: apt-pkg/pkgcache.cc:232
#: apt-pkg/pkgcache.cc:241
msgid "optional"
msgstr ""
#: apt-pkg/pkgcache.cc:232
#: apt-pkg/pkgcache.cc:241
msgid "extra"
msgstr ""
@ -2128,12 +2136,12 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr ""
#: apt-pkg/init.cc:119
#: apt-pkg/init.cc:122
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr ""
#: apt-pkg/init.cc:135
#: apt-pkg/init.cc:138
msgid "Unable to determine a suitable packaging system type"
msgstr ""
@ -2176,73 +2184,87 @@ msgstr ""
msgid "Error occured while processing %s (NewPackage)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:129
#: apt-pkg/pkgcachegen.cc:145
#, c-format
msgid "Error occured while processing %s (NewFileDesc1)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:151
#, c-format
msgid "Error occured while processing %s (UsePackage1)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:150
#: apt-pkg/pkgcachegen.cc:172
#, c-format
msgid "Error occured while processing %s (UsePackage2)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:154
#: apt-pkg/pkgcachegen.cc:176
#, c-format
msgid "Error occured while processing %s (NewFileVer1)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:184
#: apt-pkg/pkgcachegen.cc:207
#, c-format
msgid "Error occured while processing %s (NewVersion1)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:188
#: apt-pkg/pkgcachegen.cc:211
#, c-format
msgid "Error occured while processing %s (UsePackage3)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:192
#: apt-pkg/pkgcachegen.cc:215
#, c-format
msgid "Error occured while processing %s (NewVersion2)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:207
#: apt-pkg/pkgcachegen.cc:239
#, c-format
msgid "Error occured while processing %s (NewFileDesc2)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:245
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
#: apt-pkg/pkgcachegen.cc:210
#: apt-pkg/pkgcachegen.cc:248
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr ""
#: apt-pkg/pkgcachegen.cc:213
#: apt-pkg/pkgcachegen.cc:251
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr ""
#: apt-pkg/pkgcachegen.cc:254
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
#: apt-pkg/pkgcachegen.cc:241
#: apt-pkg/pkgcachegen.cc:282
#, c-format
msgid "Error occured while processing %s (FindPkg)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:254
#: apt-pkg/pkgcachegen.cc:295
#, c-format
msgid "Error occured while processing %s (CollectFileProvides)"
msgstr ""
#: apt-pkg/pkgcachegen.cc:260
#: apt-pkg/pkgcachegen.cc:301
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr ""
#: apt-pkg/pkgcachegen.cc:574
#: apt-pkg/pkgcachegen.cc:670
#, c-format
msgid "Couldn't stat source package list %s"
msgstr ""
#: apt-pkg/pkgcachegen.cc:658
#: apt-pkg/pkgcachegen.cc:754
msgid "Collecting File Provides"
msgstr ""
#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
#: apt-pkg/pkgcachegen.cc:881 apt-pkg/pkgcachegen.cc:888
msgid "IO Error saving source cache"
msgstr ""
@ -2251,31 +2273,31 @@ msgstr ""
msgid "rename failed, %s (%s -> %s)."
msgstr ""
#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:929
msgid "MD5Sum mismatch"
msgstr ""
#: apt-pkg/acquire-item.cc:708
#: apt-pkg/acquire-item.cc:743
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
#: apt-pkg/acquire-item.cc:761
#: apt-pkg/acquire-item.cc:796
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
#: apt-pkg/acquire-item.cc:797
#: apt-pkg/acquire-item.cc:832
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
#: apt-pkg/acquire-item.cc:884
#: apt-pkg/acquire-item.cc:919
msgid "Size mismatch"
msgstr ""

Loading…
Cancel
Save