Browse Source

apt-pkg/tagfile.h: add dpointer placeholder, make destructor virtual; apt-pkg/deb/debsystem.h: make destructor virtual

debian/1.8.y
Michael Vogt 11 years ago
parent
commit
43fb90dcd5
  1. 2
      apt-pkg/deb/debsystem.h
  2. 10
      apt-pkg/tagfile.h
  3. 104
      po/apt-all.pot

2
apt-pkg/deb/debsystem.h

@ -34,7 +34,7 @@ class debSystem : public pkgSystem
pkgIndexFile *&Found) const;
debSystem();
~debSystem();
virtual ~debSystem();
};
extern debSystem debSys;

10
apt-pkg/tagfile.h

@ -31,11 +31,8 @@ class pkgTagSection
unsigned int Indexes[256];
unsigned int AlphaIndexes[0x100];
unsigned int TagCount;
// for later
int *reserved1;
int *reserved2;
int *reserved3;
int *reserved4;
// dpointer placeholder (for later in case we need it)
void *d;
/* This very simple hash function for the last 8 letters gives
very good performance on the debian package files */
@ -80,6 +77,7 @@ class pkgTagSection
};
pkgTagSection() : Section(0), Stop(0) {};
virtual ~pkgTagSection() {};
};
class pkgTagFilePrivate;
@ -97,7 +95,7 @@ class pkgTagFile
bool Jump(pkgTagSection &Tag,unsigned long Offset);
pkgTagFile(FileFd *F,unsigned long Size = 32*1024);
~pkgTagFile();
virtual ~pkgTagFile();
};
/* This is the list of things to rewrite. The rewriter

104
po/apt-all.pot

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-09-28 17:23+0200\n"
"POT-Creation-Date: 2011-01-28 20:55+0100\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"
@ -95,13 +95,13 @@ msgstr ""
msgid "Package file %s is out of sync."
msgstr ""
#: cmdline/apt-cache.cc:1273
msgid "You must give at least one search pattern"
#: cmdline/apt-cache.cc:591 cmdline/apt-cache.cc:1429
#: cmdline/apt-cache.cc:1431 cmdline/apt-cache.cc:1508
msgid "No packages found"
msgstr ""
#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
#: cmdline/apt-cache.cc:1508
msgid "No packages found"
#: cmdline/apt-cache.cc:1273
msgid "You must give at least one search pattern"
msgstr ""
#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440
@ -868,7 +868,7 @@ msgstr ""
msgid "Do you want to continue [Y/n]? "
msgstr ""
#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:2392 apt-pkg/algorithms.cc:1462
#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:2392 apt-pkg/algorithms.cc:1470
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr ""
@ -1236,33 +1236,33 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
#: cmdline/acqprogress.cc:55
#: cmdline/acqprogress.cc:57
msgid "Hit "
msgstr ""
#: cmdline/acqprogress.cc:79
#: cmdline/acqprogress.cc:81
msgid "Get:"
msgstr ""
#: cmdline/acqprogress.cc:110
#: cmdline/acqprogress.cc:112
msgid "Ign "
msgstr ""
#: cmdline/acqprogress.cc:114
#: cmdline/acqprogress.cc:116
msgid "Err "
msgstr ""
#: cmdline/acqprogress.cc:135
#: cmdline/acqprogress.cc:137
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr ""
#: cmdline/acqprogress.cc:225
#: cmdline/acqprogress.cc:227
#, c-format
msgid " [Working]"
msgstr ""
#: cmdline/acqprogress.cc:271
#: cmdline/acqprogress.cc:283
#, c-format
msgid ""
"Media change: please insert the disc labeled\n"
@ -2220,27 +2220,27 @@ msgstr ""
msgid "write, still have %lu to write but couldn't"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:937
#: apt-pkg/contrib/fileutl.cc:967
#, c-format
msgid "Problem closing the gzip file %s"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:940
#: apt-pkg/contrib/fileutl.cc:970
#, c-format
msgid "Problem closing the file %s"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:945
#: apt-pkg/contrib/fileutl.cc:975
#, c-format
msgid "Problem renaming the file %s to %s"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:956
#: apt-pkg/contrib/fileutl.cc:986
#, c-format
msgid "Problem unlinking the file %s"
msgstr ""
#: apt-pkg/contrib/fileutl.cc:969
#: apt-pkg/contrib/fileutl.cc:999
msgid "Problem syncing the file"
msgstr ""
@ -2352,12 +2352,12 @@ msgstr ""
msgid "Internal error, group '%s' has no installable pseudo package"
msgstr ""
#: apt-pkg/tagfile.cc:102
#: apt-pkg/tagfile.cc:123
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr ""
#: apt-pkg/tagfile.cc:189
#: apt-pkg/tagfile.cc:210
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr ""
@ -2465,17 +2465,17 @@ msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
#: apt-pkg/algorithms.cc:1210
#: apt-pkg/algorithms.cc:1218
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
#: apt-pkg/algorithms.cc:1212
#: apt-pkg/algorithms.cc:1220
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
#: apt-pkg/algorithms.cc:1488 apt-pkg/algorithms.cc:1490
#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@ -2918,148 +2918,148 @@ msgstr ""
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:52
#: apt-pkg/deb/dpkgpm.cc:67
#, c-format
msgid "Installing %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:822
#: apt-pkg/deb/dpkgpm.cc:68 apt-pkg/deb/dpkgpm.cc:839
#, c-format
msgid "Configuring %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:829
#: apt-pkg/deb/dpkgpm.cc:69 apt-pkg/deb/dpkgpm.cc:846
#, c-format
msgid "Removing %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:55
#: apt-pkg/deb/dpkgpm.cc:70
#, c-format
msgid "Completely removing %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:56
#: apt-pkg/deb/dpkgpm.cc:71
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:57
#: apt-pkg/deb/dpkgpm.cc:72
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
#: apt-pkg/deb/dpkgpm.cc:646
#: apt-pkg/deb/dpkgpm.cc:662
#, c-format
msgid "Directory '%s' missing"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:674
#: apt-pkg/deb/dpkgpm.cc:677 apt-pkg/deb/dpkgpm.cc:691
#, c-format
msgid "Could not open file '%s'"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:815
#: apt-pkg/deb/dpkgpm.cc:832
#, c-format
msgid "Preparing %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:816
#: apt-pkg/deb/dpkgpm.cc:833
#, c-format
msgid "Unpacking %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:821
#: apt-pkg/deb/dpkgpm.cc:838
#, c-format
msgid "Preparing to configure %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:823
#: apt-pkg/deb/dpkgpm.cc:840
#, c-format
msgid "Installed %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:828
#: apt-pkg/deb/dpkgpm.cc:845
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:830
#: apt-pkg/deb/dpkgpm.cc:847
#, c-format
msgid "Removed %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:835
#: apt-pkg/deb/dpkgpm.cc:852
#, c-format
msgid "Preparing to completely remove %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:836
#: apt-pkg/deb/dpkgpm.cc:853
#, c-format
msgid "Completely removed %s"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:1042
#: apt-pkg/deb/dpkgpm.cc:1059
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:1073
#: apt-pkg/deb/dpkgpm.cc:1090
msgid "Running dpkg"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:1276
#: apt-pkg/deb/dpkgpm.cc:1293
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
#: apt-pkg/deb/dpkgpm.cc:1281
#: apt-pkg/deb/dpkgpm.cc:1298
msgid "dependency problems - leaving unconfigured"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:1283
#: apt-pkg/deb/dpkgpm.cc:1300
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:1289
#: apt-pkg/deb/dpkgpm.cc:1306
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:1295
#: apt-pkg/deb/dpkgpm.cc:1312
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
#: apt-pkg/deb/dpkgpm.cc:1302
#: apt-pkg/deb/dpkgpm.cc:1319
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
#: apt-pkg/deb/debsystem.cc:69
#: apt-pkg/deb/debsystem.cc:79
#, c-format
msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
#: apt-pkg/deb/debsystem.cc:72
#: apt-pkg/deb/debsystem.cc:82
#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
msgstr ""
#. TRANSLATORS: the %s contains the recovery command, usually
#. dpkg --configure -a
#: apt-pkg/deb/debsystem.cc:88
#: apt-pkg/deb/debsystem.cc:98
#, c-format
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
msgstr ""
#: apt-pkg/deb/debsystem.cc:106
#: apt-pkg/deb/debsystem.cc:116
msgid "Not locked"
msgstr ""

Loading…
Cancel
Save