diff options
| author | bubulle@debian.org <> | 2006-10-09 22:53:10 +0200 |
|---|---|---|
| committer | bubulle@debian.org <> | 2006-10-09 22:53:10 +0200 |
| commit | c914dbcfe4421cdc904a5847860aa987807819b9 (patch) | |
| tree | 5a6c5ff64fd58eaa84b27ab158c65eb47be86d57 | |
| parent | b23f91ebeef9bf7730d5d4bd920d5bf24c50910e (diff) | |
| parent | 40e998de176d57c81bd3c49238d706a523748982 (diff) | |
Sync with Muchael
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | po/en_GB.po | 12 |
2 files changed, 16 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 6b842898c..c0036fbd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.6.46.2) unstable; urgency=low + + * Merged from Christian Perrier bzr branch: + - es.po: Updated to 514t. Closes: #391661 + - da.po: Updated to 514t. Closes: #391424 + - cs.po: Updated. Closes: #391064 + + -- + apt (0.6.46.1) unstable; urgency=low * methods/gzip.cc: @@ -16,7 +25,7 @@ apt (0.6.46.1) unstable; urgency=low * make the internal buffer in pkgTagFile grow dynamically (closes: #388708) - -- + -- Michael Vogt <mvo@debian.org> Mon, 2 Oct 2006 20:42:20 +0200 apt (0.6.46) unstable; urgency=low diff --git a/po/en_GB.po b/po/en_GB.po index 4ff5bba65..6bd42bdca 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -462,11 +462,11 @@ msgstr "W: Unable to stat %s\n" #: ftparchive/writer.cc:125 msgid "E: " -msgstr "E:" +msgstr "E: " #: ftparchive/writer.cc:127 msgid "W: " -msgstr "W:" +msgstr "W: " #: ftparchive/writer.cc:134 msgid "E: Errors apply to file " @@ -602,7 +602,7 @@ msgstr "Failed to create subprocess IPC" #: ftparchive/multicompress.cc:324 msgid "Failed to exec compressor " -msgstr "Failed to exec compressor" +msgstr "Failed to exec compressor " #: ftparchive/multicompress.cc:363 msgid "decompressor" @@ -667,7 +667,7 @@ msgstr "but it is not going to be installed" #: cmdline/apt-get.cc:346 msgid " or" -msgstr "or" +msgstr " or" #: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" @@ -1053,7 +1053,7 @@ msgstr "Recommended packages:" #: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " -msgstr "Calculating upgrade..." +msgstr "Calculating upgrade... " #: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" @@ -1279,7 +1279,7 @@ msgstr "Ign " #: cmdline/acqprogress.cc:114 msgid "Err " -msgstr "Err" +msgstr "Err " #: cmdline/acqprogress.cc:135 #, c-format |