diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-28 09:19:45 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-07-28 09:19:45 +0200 |
| commit | 0b7d641cf12761c3dcc5edb4031adfc9709963e4 (patch) | |
| tree | 5d12281c5f482e6f85636f57ef86a2dc92e8713c /doc/po/apt-doc.pot | |
| parent | 7d79339f811aeebacb3f841bac6075fdfbadd03f (diff) | |
| parent | ed6ba81db1b2832089ea443cf0030ab3f15fda97 (diff) | |
* merged latest fixes from debian-sid
* apt-pkg/contrib/sha1.cc:
- fix illegally casts of on-stack buffer to a type requiring more
alignment than it has resulting in segfaults on sparc (Closes: #634696)
* apt-pkg/contrib/cdromutl.cc:
- fix escape problem when looking for the mounted devices
* apt-pkg/contrib/strutl.{h,cc}, test/libapt/strutil_test.cc:
- add new DeEscapeString() similar to DeQuoteString but
unescape character escapes like \0XX and \xXX (plus added
test)
* refresh po/*
* cmdline/apt-get.cc:
- fix missing download progress in apt-get download
- do not require unused partial dirs in 'source' (Closes: #633510)
- buildconflicts effect all architectures
- implement MultiarchCross for build-dep and source (Closes: #632221)
* cmdline/apt-key:
- use a tmpfile instead of /etc/apt/secring.gpg (Closes: #632596)
* debian/apt.postinst:
- remove /etc/apt/secring.gpg if it is an empty file
* doc/apt-cache.8.xml:
- apply madison typofix from John Feuerstein, thanks! (Closes: #633455)
* apt-pkg/policy.cc:
- emit an error on unknown APT::Default-Release value (Closes: #407511)
* apt-pkg/aptconfiguration.cc:
- ensure that native architecture is if not specified otherwise the
first architecture in the Architectures vector
* apt-pkg/deb/deblistparser.cc:
- Strip only :any and :native if MultiArch should be stripped as it is
save to ignore them in non-MultiArch contexts but if the dependency
is a specific architecture (and not the native) do not strip
Diffstat (limited to 'doc/po/apt-doc.pot')
| -rw-r--r-- | doc/po/apt-doc.pot | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index cc60e5497..364dce12f 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -928,7 +928,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:266 -msgid "madison <replaceable>/[ pkg(s) ]</replaceable>" +msgid "madison <replaceable>[ pkg(s) ]</replaceable>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> |