From: David Kalnischkies Date: Sat, 2 Jun 2012 20:29:31 +0000 (+0200) Subject: merge with debian-sid to get all the updated l10ns X-Git-Tag: 0.9.6~1^2~23 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/c861c34804edcbe0644118dcf48c74fd552aea5a merge with debian-sid to get all the updated l10ns [ Christian Perrier ] * French program and manpage translation update * Danish program translation by Joe Hansen. Closes: #675605 --- c861c34804edcbe0644118dcf48c74fd552aea5a diff --cc debian/changelog index 08338d939,1547e5d35..d09239de5 --- a/debian/changelog +++ b/debian/changelog @@@ -1,39 -1,14 +1,43 @@@ apt (0.9.5.2) UNRELEASED; urgency=low - [ Translation of manpages ] - * Polish updated by Robert Luberda. Closes: #675603 - * French updated by Christian Perrier - - [ Translation of programs ] - * Danish by Joe Hansen. Closes: #675605 - * French updated by Christian Perrier + [ David Kalnischkies ] + * cmdline/apt-get.cc: + - do not show 'list of broken packages' header if no package + is broken as it happens e.g. for external resolver errors + * debian/apt-utils.links: + - the internal resolver 'apt' is now directly installed in + /usr/lib/apt/solvers, so don't instruct dh to create a broken link + * doc/apt-verbatim.ent: + - APT doesn't belong to the product 'Linux', so use 'APT' instead + as after all APT is a big suite of applications + * doc/examples/sources.list: + - use the codename instead of 'stable' in the examples sources.list + as we do in the manpage and as the debian-installer does + * doc/apt-get.8.xml: + - use apt-utils as package example instead of libc6 - -- Christian Perrier Sat, 02 Jun 2012 18:25:18 +0200 + [ Justin B Rye ] + * doc/apt-cdrom.8.xml: + - replace CDROM with the proper CD-ROM in text + - correct disc vs. disk issues + * doc/apt-config.8.xml: + - review and fix spelling issues + * doc/apt-extracttemplates.1.xml: + - debconf is not DebConf + * doc/apt-get.8.xml: + - move dselect-upgrade below dist-upgrade + - review and fix spelling issues + + [ Robert Luberda ] + * Polish manpage translation update (Closes: #675603) + * doc/apt-mark.8.xml: + - in hold, the option name is --file not --filename + ++ [ Christian Perrier ] ++ * French program and manpage translation update ++ * Danish program translation by Joe Hansen. Closes: #675605 ++ + -- David Kalnischkies Thu, 24 May 2012 19:40:58 +0200 apt (0.9.5.1) unstable; urgency=low diff --cc doc/po/fr.po index a7a5e3b19,08c60d915..4f73a2faa --- a/doc/po/fr.po +++ b/doc/po/fr.po @@@ -10,8 -10,8 +10,8 @@@ msgid " msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-05-24 15:57+0300\n" +"POT-Creation-Date: 2012-06-02 18:01+0300\n" - "PO-Revision-Date: 2011-02-17 07:50+0100\n" + "PO-Revision-Date: 2012-06-02 18:37+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "Language: \n"