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

4 files changed, 314 insertions, 244 deletions

diff --git a/debian/changelog b/debian/changelog
index 08338d939..d09239de5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,10 @@ apt (0.9.5.2) UNRELEASED; urgency=low
   * 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 <kalnischkies@gmail.com>  Thu, 24 May 2012 19:40:58 +0200
 
 apt (0.9.5.1) unstable; urgency=low
diff --git a/doc/po/fr.po b/doc/po/fr.po
index a7a5e3b19..4f73a2faa 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -5,20 +5,20 @@
 # Translators:
 # Jérôme Marant, 2000.
 # Philippe Batailler, 2005.
-# Christian Perrier <bubulle@debian.org>, 2009, 2010, 2011.
+# Christian Perrier <bubulle@debian.org>, 2009, 2010, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\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 <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: TH
@@ -173,7 +173,8 @@ msgid ""
 msgstr ""
 "<!ENTITY apt-qapage \"\n"
 "\t<para>\n"
-"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Page qualité</ulink>\n"
+"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Page qualité</ulink>"
+"\n"
 "\t</para>\n"
 "\">\n"
 
@@ -195,7 +196,8 @@ msgstr ""
 "<!-- Boiler plate Bug reporting section -->\n"
 "<!ENTITY manbugs \"\n"
 " <refsect1><title>Bogues</title>\n"
-"   <para><ulink url='http://bugs.debian.org/src:apt'>Page des bogues d'APT</ulink>. \n"
+"   <para><ulink url='http://bugs.debian.org/src:apt'>Page des bogues d'APT<"
+"/ulink>. \n"
 "   Si vous souhaitez signaler un bogue à propos d'APT, veuillez lire\n"
 "   <filename>/usr/share/doc/debian/bug-reporting.txt</filename> ou utiliser\n"
 "   la commande &reportbug;.\n"
@@ -210,7 +212,8 @@ msgid ""
 "<!-- Boiler plate Author section -->\n"
 "<!ENTITY manauthor \"\n"
 " <refsect1><title>Author</title>\n"
-"   <para>APT was written by the APT team <email>apt@packages.debian.org</email>.\n"
+"   <para>APT was written by the APT team <email>apt@packages.debian.org<"
+"/email>.\n"
 "   </para>\n"
 " </refsect1>\n"
 "\">\n"
@@ -218,7 +221,8 @@ msgstr ""
 "<!-- Boiler plate Author section -->\n"
 "<!ENTITY manauthor \"\n"
 " <refsect1><title>Author</title>\n"
-"   <para>APT a été écrit par l'équipe de développement APT <email>apt@packages.debian.org</email>.\n"
+"   <para>APT a été écrit par l'équipe de développement APT <email>"
+"apt@packages.debian.org</email>.\n"
 "   </para>\n"
 " </refsect1>\n"
 "\">\n"
@@ -274,10 +278,12 @@ msgid ""
 "     <varlistentry>\n"
 "      <term><option>-c</option></term>\n"
 "      <term><option>--config-file</option></term>\n"
-"     <listitem><para>Configuration File; Specify a configuration file to use. \n"
+"     <listitem><para>Configuration File; Specify a configuration file to use. "
+"\n"
 "     The program will read the default configuration file and then this \n"
 "     configuration file. If configuration settings need to be set before the\n"
-"     default configuration files are parsed specify a file with the <envar>APT_CONFIG</envar>\n"
+"     default configuration files are parsed specify a file with the <envar>"
+"APT_CONFIG</envar>\n"
 "     environment variable. See &apt-conf; for syntax information.\n"
 "     </para>\n"
 "     </listitem>\n"
@@ -286,10 +292,15 @@ msgstr ""
 "     <varlistentry>\n"
 "      <term><option>-c</option></term>\n"
 "      <term><option>--config-file</option></term>\n"
-"     <listitem><para>Fichier de configuration ; indique le fichier de configuration à utiliser. \n"
-"     Le programme lira le fichier de configuration par défaut puis le fichier indiqué ici. \n"
-"     Si les réglages de configuration doivent être établis avant l'analyse des fichiers\n"
-"     de configuration par défaut, un fichier peut être indiqué avec la variable d'environnement <envar>APT_CONFIG</envar>.     Veuillez consulter &apt-conf; pour des informations sur la syntaxe d'utilisation.     \n"
+"     <listitem><para>Fichier de configuration ; indique le fichier de "
+"configuration à utiliser. \n"
+"     Le programme lira le fichier de configuration par défaut puis le fichier "
+"indiqué ici. \n"
+"     Si les réglages de configuration doivent être établis avant l'analyse "
+"des fichiers\n"
+"     de configuration par défaut, un fichier peut être indiqué avec la "
+"variable d'environnement <envar>APT_CONFIG</envar>.     Veuillez consulter "
+"&apt-conf; pour des informations sur la syntaxe d'utilisation.     \n"
 "     </para>\n"
 "     </listitem>\n"
 "     </varlistentry>\n"
@@ -314,8 +325,10 @@ msgstr ""
 "      <term><option>-o</option></term>\n"
 "      <term><option>--option</option></term>\n"
 "     <listitem><para>Définir une option de configuration ; permet de régler\n"
-"      une option de configuration donnée. La syntaxe est <option>-o Foo::Bar=bar</option>.\n"
-"      <option>-o</option> et <option>--option</option> peuvent être utilisées plusieurs fois\n"
+"      une option de configuration donnée. La syntaxe est <option>-o "
+"Foo::Bar=bar</option>.\n"
+"      <option>-o</option> et <option>--option</option> peuvent être utilisées "
+"plusieurs fois\n"
 "      pour définir des options différentes.\n"
 "     </para>\n"
 "     </listitem>\n"
@@ -329,7 +342,8 @@ msgid ""
 "<!-- Should be used within the option section of the text to\n"
 "     put in the blurb about -h, -v, -c and -o -->\n"
 "<!ENTITY apt-cmdblurb \"\n"
-"   <para>All command line options may be set using the configuration file, the\n"
+"   <para>All command line options may be set using the configuration file, "
+"the\n"
 "   descriptions indicate the configuration option to set. For boolean\n"
 "   options you can override the config file by using something like \n"
 "   <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>\n"
@@ -340,9 +354,12 @@ msgstr ""
 "<!-- Should be used within the option section of the text to\n"
 "     put in the blurb about -h, -v, -c and -o -->\n"
 "<!ENTITY apt-cmdblurb \"\n"
-"   <para>Toutes les options de la ligne de commande peuvent être définies dans le fichier de configuration, \n"
-"   les descriptions indiquant l'option de configuration concernée. Pour les options\n"
-"   booléennes, vous pouvez inverser les réglages du fichiers de configuration avec \n"
+"   <para>Toutes les options de la ligne de commande peuvent être définies "
+"dans le fichier de configuration, \n"
+"   les descriptions indiquant l'option de configuration concernée. Pour les "
+"options\n"
+"   booléennes, vous pouvez inverser les réglages du fichiers de configuration "
+"avec \n"
 "   <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>\n"
 "   et d'autres variantes analogues.\n"
 "   </para>\n"
@@ -355,13 +372,15 @@ msgid ""
 "<!ENTITY file-aptconf \"\n"
 "     <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
 "     <listitem><para>APT configuration file.\n"
-"     Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>"
+"\n"
 "     </varlistentry>\n"
 msgstr ""
 "<!ENTITY file-aptconf \"\n"
 "     <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
 "     <listitem><para>Fichier de configuration d'APT.\n"
-"     Élément de configuration : <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
+"     Élément de configuration : <literal>Dir::Etc::Main</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 
 #. type: Plain text
@@ -370,13 +389,15 @@ msgstr ""
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
 "     <listitem><para>APT configuration file fragments.\n"
-"     Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>"
+"\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
 "     <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
 "     <listitem><para>Fragments du fichier de configuration d'APT.\n"
-"     Élément de configuration : <literal>Dir::Etc::Parts</literal>.</para></listitem>\n"
+"     Élément de configuration : <literal>Dir::Etc::Parts</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -387,18 +408,20 @@ msgid ""
 "<!ENTITY file-cachearchives \"\n"
 "     <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
 "     <listitem><para>Storage area for retrieved package files.\n"
-"     Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Cache::Archives</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 "<!ENTITY file-cachearchives \"\n"
 "     <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
 "     <listitem><para>Zone de stockage des fichiers récupérés.\n"
-"     Élément de configuration : <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
+"     Élément de configuration : <literal>Dir::Cache::Archives</literal>.<"
+"/para></listitem>\n"
 "     </varlistentry>\n"
 
 #. type: Plain text
 #: apt.ent:109
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
 #| "     <listitem><para>Storage area for package files in transit.\n"
@@ -406,15 +429,19 @@ msgstr ""
 #| "     </varlistentry>\n"
 #| "\">\n"
 msgid ""
-"     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+"     <varlistentry><term><filename>&cachedir;/archives/partial/</filename><"
+"/term>\n"
 "     <listitem><para>Storage area for package files in transit.\n"
-"     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Cache::Archives</literal> (<filename>"
+"partial</filename> will be implicitly appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
-"     <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+"     <varlistentry><term><filename>&cachedir;/archives/partial/</filename><"
+"/term>\n"
 "     <listitem><para>Zone de stockage pour les paquets en transit.\n"
-"     Élément de configuration : <literal>Dir::Cache::Archives</literal> (implicitement, partial). </para></listitem>\n"
+"     Élément de configuration : <literal>Dir::Cache::Archives</literal> (<"
+"filename>partial</filename> sera implicitement ajouté). </para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -429,14 +456,18 @@ msgid ""
 "     i.e. a preference to get certain packages\n"
 "     from a separate source\n"
 "     or from a different version of a distribution.\n"
-"     Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 "<!ENTITY file-preferences \"\n"
 "     <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n"
 "     <listitem><para>Fichier des préférences.\n"
-"     C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une distribution différente.\n"
-"     Élément de configuration : <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
+"     C'est dans ce fichier qu'on peut faire de l'épinglage (pinning) "
+"c'est-à-dire, choisir d'obtenir des paquets d'une source distincte ou d'une "
+"distribution différente.\n"
+"     Élément de configuration : <literal>Dir::Etc::Preferences</literal>.<"
+"/para></listitem>\n"
 "     </varlistentry>\n"
 
 #. type: Plain text
@@ -445,13 +476,15 @@ msgstr ""
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
 "     <listitem><para>File fragments for the version preferences.\n"
-"     Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Etc::PreferencesParts</literal>.</para>"
+"</listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
 "     <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
 "     <listitem><para>Fragments de fichiers pour la préférence des versions.\n"
-"     Élément de configuration : <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n"
+"     Élément de configuration : <literal>Dir::Etc::PreferencesParts</literal>."
+"</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -462,28 +495,35 @@ msgid ""
 "<!ENTITY file-sourceslist \"\n"
 "     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
 "     <listitem><para>Locations to fetch packages from.\n"
-"     Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 "<!ENTITY file-sourceslist \"\n"
 "     <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
 "     <listitem><para>Emplacement pour la récupération des paquets.\n"
-"     Élément de configuration : <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+"     Élément de configuration : <literal>Dir::Etc::SourceList</literal>.<"
+"/para></listitem>\n"
 "     </varlistentry>\n"
 
 #. type: Plain text
 #: apt.ent:137
 #, no-wrap
 msgid ""
-"     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+"     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>"
+"\n"
 "     <listitem><para>File fragments for locations to fetch packages from.\n"
-"     Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
-"     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
-"     <listitem><para>Fragments de fichiers définissant les emplacements de récupération de paquets.\n"
-"     Élément de configuration : <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+"     <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>"
+"\n"
+"     <listitem><para>Fragments de fichiers définissant les emplacements de "
+"récupération de paquets.\n"
+"     Élément de configuration : <literal>Dir::Etc::SourceParts</literal>.<"
+"/para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -493,20 +533,24 @@ msgstr ""
 msgid ""
 "<!ENTITY file-statelists \"\n"
 "     <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
-"     <listitem><para>Storage area for state information for each package resource specified in\n"
+"     <listitem><para>Storage area for state information for each package "
+"resource specified in\n"
 "     &sources-list;\n"
-"     Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
+"     Configuration Item: <literal>Dir::State::Lists</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 "<!ENTITY file-statelists \"\n"
 "     <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
-"     <listitem><para>Zone de stockage pour les informations qui concernent chaque ressource de paquet spécifiée dans &sources-list;\n"
-"     Élément de configuration : <literal>Dir::State::Lists</literal>.</para></listitem>\n"
+"     <listitem><para>Zone de stockage pour les informations qui concernent "
+"chaque ressource de paquet spécifiée dans &sources-list;\n"
+"     Élément de configuration : <literal>Dir::State::Lists</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 
 #. type: Plain text
 #: apt.ent:150
-#, fuzzy, no-wrap
+#, no-wrap
 #| msgid ""
 #| "     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
 #| "     <listitem><para>Storage area for state information in transit.\n"
@@ -514,15 +558,19 @@ msgstr ""
 #| "     </varlistentry>\n"
 #| "\">\n"
 msgid ""
-"     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+"     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>"
+"\n"
 "     <listitem><para>Storage area for state information in transit.\n"
-"     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>partial</filename> will be implicitly appended)</para></listitem>\n"
+"     Configuration Item: <literal>Dir::State::Lists</literal> (<filename>"
+"partial</filename> will be implicitly appended)</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
-"     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+"     <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>"
+"\n"
 "     <listitem><para>Zone de stockage pour les informations en transit.\n"
-"     Élément de configuration : <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
+"     Élément de configuration : <literal>Dir::State::Lists</literal> (<"
+"filename>partial</filename> sera implicitement ajouté).</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -532,14 +580,18 @@ msgstr ""
 msgid ""
 "<!ENTITY file-trustedgpg \"\n"
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
-"     <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
-"     Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+"     <listitem><para>Keyring of local trusted keys, new keys will be added "
+"here.\n"
+"     Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 msgstr ""
 "<!ENTITY file-trustedgpg \"\n"
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
-"     <listitem><para>Porte-clés des clés de confiance locales. Les nouvelles clés y seront ajoutées.\n"
-"     Élément de configuration: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+"     <listitem><para>Porte-clés des clés de confiance locales. Les nouvelles "
+"clés y seront ajoutées.\n"
+"     Élément de configuration: <literal>Dir::Etc::Trusted</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 
 #. type: Plain text
@@ -547,16 +599,21 @@ msgstr ""
 #, no-wrap
 msgid ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
-"     <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
+"     <listitem><para>File fragments for the trusted keys, additional keyrings "
+"can\n"
 "     be stored here (by other packages or the administrator).\n"
-"     Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+"     Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para><"
+"/listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 msgstr ""
 "     <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
-"     <listitem><para>Fragments de fichiers pour les clés de signatures sûres. Des fichiers\n"
-"     supplémentaires peuvent être placés à cet endroit (par des paquets ou par l'administrateur).\n"
-"     Élément de configuration : <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
+"     <listitem><para>Fragments de fichiers pour les clés de signatures sûres. "
+"Des fichiers\n"
+"     supplémentaires peuvent être placés à cet endroit (par des paquets ou "
+"par l'administrateur).\n"
+"     Élément de configuration : <literal>Dir::Etc::TrustedParts</literal>.<"
+"/para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -565,7 +622,8 @@ msgstr ""
 #, no-wrap
 msgid ""
 "<!ENTITY file-extended_states \"\n"
-"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"      <varlistentry><term><filename>/var/lib/apt/extended_states</filename><"
+"/term>\n"
 "      <listitem><para>Status list of auto-installed packages.\n"
 "      Configuration Item: <literal>Dir::State::extended_states</literal>.\n"
 "      </para></listitem>\n"
@@ -573,9 +631,11 @@ msgid ""
 "\">\n"
 msgstr ""
 "<!ENTITY file-extended_states \"\n"
-"     <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+"     <varlistentry><term><filename>/var/lib/apt/extended_states</filename><"
+"/term>\n"
 "     <listitem><para>Liste d'état des paquets installés automatiquement.\n"
-"     Élément de configuration : <literal>Dir::State::extended_states</literal>.</para></listitem>\n"
+"     Élément de configuration : <literal>Dir::State::extended_states</literal>"
+".</para></listitem>\n"
 "     </varlistentry>\n"
 "\">\n"
 
@@ -583,8 +643,10 @@ msgstr ""
 #: apt.ent:175
 #, no-wrap
 msgid ""
-"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
-"     to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - "
+"comparable\n"
+"     to the other headers like NAME and DESCRIPTION and should therefore be "
+"uppercase. -->\n"
 "<!ENTITY translation-title \"TRANSLATION\">\n"
 msgstr "<!ENTITY translation-title \"TRADUCTEURS\">\n"
 
@@ -592,28 +654,39 @@ msgstr "<!ENTITY translation-title \"TRADUCTEURS\">\n"
 #: apt.ent:184
 #, no-wrap
 msgid ""
-"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
-"     to the translation in the past, who is responsible now and maybe further information\n"
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has "
+"contributed\n"
+"     to the translation in the past, who is responsible now and maybe further "
+"information\n"
 "     specially related to your translation. -->\n"
 "<!ENTITY translation-holder \"\n"
-"     The english translation was done by John Doe <email>john@doe.org</email> in 2009,\n"
-"     2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together with the\n"
-"     Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
+"     The english translation was done by John Doe <email>john@doe.org</email> "
+"in 2009,\n"
+"     2010 and Daniela Acme <email>daniela@acme.us</email> in 2010 together "
+"with the\n"
+"     Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>."
+"\n"
 "\">\n"
 msgstr ""
 "<!ENTITY translation-holder \"\n"
-"     Jérôme Marant, Philippe Batailler, Christian Perrier <email>bubulle@debian.org</email> (2000, 2005, 2009, 2010),\n"
-"     Équipe de traduction francophone de Debian <email>debian-l10n-french@lists.debian.org</email>\n"
+"     Jérôme Marant, Philippe Batailler, Christian Perrier <email>"
+"bubulle@debian.org</email> (2000, 2005, 2009, 2010),\n"
+"     Équipe de traduction francophone de Debian <email>"
+"debian-l10n-french@lists.debian.org</email>\n"
 "\">\n"
 
 #. type: Plain text
 #: apt.ent:195
 #, no-wrap
 msgid ""
-"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
-"     in a shipped manpage newer/modified paragraphs will maybe appear in english in\n"
-"     the generated manpage. This sentence is therefore here to tell the reader that this\n"
-"     is not a mistake by the translator - obviously the target is that at least for stable\n"
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of "
+"untranslated/fuzzy strings\n"
+"     in a shipped manpage newer/modified paragraphs will maybe appear in "
+"english in\n"
+"     the generated manpage. This sentence is therefore here to tell the "
+"reader that this\n"
+"     is not a mistake by the translator - obviously the target is that at "
+"least for stable\n"
 "     releases this sentence is not needed. :) -->\n"
 "<!ENTITY translation-english \"\n"
 "     Note that this translated document may contain untranslated parts.\n"
@@ -622,7 +695,8 @@ msgid ""
 "\">\n"
 msgstr ""
 "<!ENTITY translation-english \"\n"
-"     Veuillez noter que cette traduction peut contenir des parties non traduites.\n"
+"     Veuillez noter que cette traduction peut contenir des parties non "
+"traduites.\n"
 "     Cela est volontaire, pour éviter de perdre du contenu quand la\n"
 "     traduction est légèrement en retard sur le contenu d'origine.\n"
 "\">\n"
@@ -633,13 +707,15 @@ msgid ""
 "<!-- TRANSLATOR: used as in -o=config_string e.g. -o=Debug::"
 "pkgProblemResolver=1 --> <!ENTITY synopsis-config-string \"config_string\">"
 msgstr ""
+"pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
+"\"chaîne_de_configuration\">"
 
 #. type: Plain text
 #: apt.ent:201
 msgid ""
 "<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
 "synopsis-config-file \"config_file\">"
-msgstr ""
+msgstr "synopsis-config-file \"fichier_de_configuration\">"
 
 #. type: Plain text
 #: apt.ent:204
@@ -648,41 +724,43 @@ msgid ""
 "t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
 "\"target_release\">"
 msgstr ""
+"t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"publication_cible\">"
 
 #. type: Plain text
 #: apt.ent:207
 msgid ""
 "<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
 "synopsis-architecture \"architecture\">"
-msgstr ""
+msgstr "synopsis-architecture \"architecture\">"
 
 #. type: Plain text
 #: apt.ent:210
 msgid ""
 "<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
 "--> <!ENTITY synopsis-pkg \"pkg\">"
-msgstr ""
+msgstr "--> <!ENTITY synopsis-pkg \"paquet\">"
 
 #. type: Plain text
 #: apt.ent:213
 msgid ""
 "<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> <!"
 "ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
-msgstr ""
+msgstr "ENTITY synopsis-pkg-ver-number \"numéro_version_paquet\">"
 
 #. type: Plain text
 #: apt.ent:216
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
 "pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
-msgstr ""
+msgstr "pkgnames apt --> <!ENTITY synopsis-prefix \"préfixe\">"
 
 #. type: Plain text
 #: apt.ent:219
 msgid ""
 "<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
 "awesome --> <!ENTITY synopsis-regex \"regex\">"
-msgstr ""
+msgstr "awesome --> <!ENTITY synopsis-regex \"expression_régulière\">"
 
 #. type: Plain text
 #: apt.ent:222
@@ -690,6 +768,7 @@ msgid ""
 "<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom -"
 "d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
 msgstr ""
+"d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"point_de_montage_CD-ROM\">"
 
 #. type: Plain text
 #: apt.ent:225
@@ -698,13 +777,15 @@ msgid ""
 "apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
 "\"temporary_directory\">"
 msgstr ""
+"apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"\"répertoire_temporaire\">"
 
 #. type: Plain text
 #: apt.ent:228
 msgid ""
 "<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
 "synopsis-filename \"filename\">"
-msgstr ""
+msgstr "synopsis-filename \"nom_de_fichier\">"
 
 #. type: Plain text
 #: apt.ent:231
@@ -712,6 +793,7 @@ msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
 msgstr ""
+"packages path override-file pathprefix --> <!ENTITY synopsis-path \"chemin\">"
 
 #. type: Plain text
 #: apt.ent:234
@@ -720,6 +802,8 @@ msgid ""
 "packages path override-file pathprefix --> <!ENTITY synopsis-override "
 "\"override-file\">"
 msgstr ""
+"packages path override-file pathprefix --> <!ENTITY synopsis-override "
+"\"fichier-override\">"
 
 #. type: Plain text
 #: apt.ent:237
@@ -728,20 +812,22 @@ msgid ""
 "packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
 "\"pathprefix\">"
 msgstr ""
+"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+"\"préfixe_de_chemin\">"
 
 #. type: Plain text
 #: apt.ent:240
 msgid ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
-msgstr ""
+msgstr "generate section --> <!ENTITY synopsis-section \"section\">"
 
 #. type: Plain text
 #: apt.ent:243
 msgid ""
 "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
 "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
+msgstr "473041FA --> <!ENTITY synopsis-keyid \"id_de_clé\">"
 
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26
@@ -801,13 +887,16 @@ msgid ""
 "<literal>gencaches</literal> creates APT's package cache. This is done "
 "implicitly by all commands needing this cache if it is missing or outdated."
 msgstr ""
+"<literal>gencaches</literal> crée le cache d'APT. Cette action est faite "
+"implicitement par toute commande qui a besoin de ce cache s'il est manquant "
+"ou obsolète."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
 #: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163
 #: apt-cache.8.xml:185 apt-cache.8.xml:190 apt-cache.8.xml:206
 #: apt-cache.8.xml:224 apt-cache.8.xml:236
 msgid "&synopsis-pkg;"
-msgstr ""
+msgstr "&synopsis-pkg;"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:54
@@ -971,7 +1060,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
 #: apt-cache.8.xml:128
-#, fuzzy
 #| msgid ""
 #| "<literal>Total distinct</literal> versions is the number of package "
 #| "versions found in the cache; this value is therefore at least equal to "
@@ -1002,7 +1090,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:143
-#, fuzzy
 #| msgid ""
 #| "<literal>showsrc</literal> displays all the source package records that "
 #| "match the given package names. All versions are shown, as well as all "
@@ -1061,7 +1148,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:170
-#, fuzzy
 #| msgid ""
 #| "<literal>search</literal> performs a full text search on all available "
 #| "package lists for the POSIX regex pattern given, see "
@@ -1084,7 +1170,8 @@ msgid ""
 "description is not searched, only the package name is."
 msgstr ""
 "La commande <literal>search</literal> recherche l'expression rationnelle "
-"donnée en paramètre sur tous les paquets disponibles. Elle cherche une "
+"POSIX donnée en paramètre sur tous les paquets disponibles, voir &regex;. "
+"Elle cherche une "
 "occurrence de la chaîne dans les noms de paquets et dans les descriptions "
 "puis elle affiche le nom du paquet et sa description courte. Quand l'option "
 "<option>--full</option> est fournie, la sortie est identique à "
@@ -1175,7 +1262,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-cache.8.xml:216
-#, fuzzy
 #| msgid ""
 #| "The resulting nodes will have several shapes; normal packages are boxes, "
 #| "pure provides are triangles, mixed provides are diamonds, missing "
@@ -2740,8 +2826,12 @@ msgstr "Exemples"
 #. type: Content of: <refentry><refsect1><para><programlisting>
 #: apt-ftparchive.1.xml:602
 #, no-wrap
-msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
-msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgid ""
+"<command>apt-ftparchive</command> packages <replaceable>directory<"
+"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgstr ""
+"<command>apt-ftparchive</command> packages <replaceable>répertoire<"
+"/replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:598
@@ -5373,8 +5463,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
 #: apt.conf.5.xml:452
 #, no-wrap
-msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
-msgstr "Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<replaceable>NomMethode</replaceable>\";"
+msgid ""
+"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<"
+"replaceable>Methodname</replaceable>\";"
+msgstr ""
+"Acquire::CompressionTypes::<replaceable>ExtensionFichier</replaceable> \"<"
+"replaceable>NomMethode</replaceable>\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:447
@@ -5535,8 +5629,10 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
 #: apt.conf.5.xml:500
 #, no-wrap
-msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
-msgstr "Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
+msgid ""
+"Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
+msgstr ""
+"Acquire::Languages { \"environment\"; \"fr\"; \"en\"; \"none\"; \"de\"; };"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:490
@@ -6183,7 +6279,7 @@ msgstr ""
 
 #.  TODO: provide a
 #. 	   motivating example, except I haven't a clue why you'd want
-#. 	   to do this. 
+#. 	   to do this.
 #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
 #: apt.conf.5.xml:775
 msgid ""
@@ -6466,7 +6562,7 @@ msgstr ""
 "Le fichier &configureindex; contient un modèle de fichier montrant des "
 "exemples pour toutes les options existantes."
 
-#.  ? reading apt.conf 
+#.  ? reading apt.conf
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:1125
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
@@ -6588,8 +6684,12 @@ msgstr "Priorités affectées par défaut"
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:94
 #, no-wrap
-msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
-msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n"
+msgid ""
+"<command>apt-get install -t testing <replaceable>some-package</replaceable><"
+"/command>\n"
+msgstr ""
+"<command>apt-get install -t testing <replaceable>paquet</replaceable><"
+"/command>\n"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
 #: apt_preferences.5.xml:97
@@ -7729,8 +7829,10 @@ msgstr "Suivre l'évolution d'une version par son nom de code"
 #: apt_preferences.5.xml:654
 #, no-wrap
 msgid ""
-"Explanation: Uninstall or do not install any Debian-originated package versions\n"
-"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
+"Explanation: Uninstall or do not install any Debian-originated package "
+"versions\n"
+"Explanation: other than those in the distribution codenamed with "
+"&testing-codename; or sid\n"
 "Package: *\n"
 "Pin: release n=&testing-codename;\n"
 "Pin-Priority: 900\n"
@@ -8062,11 +8164,13 @@ msgstr "Exemples :"
 #, no-wrap
 msgid ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib "
+"non-free\n"
 "   "
 msgstr ""
 "deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib "
+"non-free\n"
 "   "
 
 #. type: Content of: <refentry><refsect1><title>
@@ -8566,7 +8670,8 @@ msgid ""
 "Building Dependency Tree... Done"
 msgstr ""
 "# apt-get update\n"
-"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
+"Réception de http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ "
+"Packages\n"
 "Réception de http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Lecture des listes de paquets... Fait\n"
 "Construction de l'arbre des dépendances... Fait"
@@ -9286,9 +9391,11 @@ msgid ""
 "12 packages not fully installed or removed.\n"
 "Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
 msgstr ""
-"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis à jour.\n"
+"206 paquets mis à jour, 8 nouvellement installés, 23 à enlever et 51 non mis "
+"à jour.\n"
 "12 paquets partiellement installés ou enlevés.\n"
-"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette opération, 26,5Mo d'espace disque supplémentaires seront utilisés."
+"Il est nécessaire de prendre 65,7Mo/66,7Mo dans les archives. Après cette "
+"opération, 26,5Mo d'espace disque supplémentaires seront utilisés."
 
 #. type: <p></p>
 #: guide.sgml:470
@@ -9358,10 +9465,12 @@ msgid ""
 "11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
 msgstr ""
 "# apt-get update\n"
-"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
+"Réception de :1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ "
+"Packages\n"
 "Réception de :2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
 "Atteint http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
-"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
+"Réception de :4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ "
+"Packages\n"
 "Réception de :5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
 "11% [5 testing/non-free `Attente du fichier' 0/32.1k 0%] 2203b/s 1m52s"
 
@@ -9727,7 +9836,8 @@ msgstr ""
 " # apt-get update\n"
 " [ APT récupère les fichiers des paquets ]\n"
 " # apt-get dist-upgrade\n"
-" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine distante ]"
+" [ APT récupère tous les fichiers nécessaires à la mise à jour de la machine "
+"distante ]"
 
 #. type: </example></p>
 #: offline.sgml:149
@@ -9848,7 +9958,8 @@ msgid ""
 " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
 msgstr ""
 " # apt-get dist-upgrade \n"
-" [ Répondre négativement à la question, pour être sûr(e) que les actions vous conviennent ]\n"
+" [ Répondre négativement à la question, pour être sûr(e) que les actions vous "
+"conviennent ]\n"
 " # apt-get -qq --print-uris dist-upgrade > uris\n"
 " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
 
diff --git a/po/da.po b/po/da.po
index 16c89a8c5..c6409028e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4,12 +4,14 @@
 # Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2002, 2003, 2004, 2005, 2006, 2007.
 # Joe Hansen <joedalton2@yahoo.dk>, 2010, 2012.
 #
+# solver -> problemløser
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: deity@lists.debian.org\n"
 "POT-Creation-Date: 2012-04-11 17:55+0200\n"
-"PO-Revision-Date: 2012-02-04 23:51+0200\n"
+"PO-Revision-Date: 2012-06-02 23:51+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
 "Language: \n"
@@ -74,7 +76,7 @@ msgstr "Sammenlagt version/fil-relationer: "
 
 #: cmdline/apt-cache.cc:345
 msgid "Total Provides mappings: "
-msgstr "Sammenlagt 'Tilbyder'-markeringer: "
+msgstr "Sammenlagt »Tilbyder«-markeringer: "
 
 #: cmdline/apt-cache.cc:357
 msgid "Total globbed strings: "
@@ -86,7 +88,7 @@ msgstr "Total afhængighedsversions-plads: "
 
 #: cmdline/apt-cache.cc:376
 msgid "Total slack space: "
-msgstr "Total 'Slack'-plads: "
+msgstr "Total »Slack«-plads: "
 
 #: cmdline/apt-cache.cc:384
 msgid "Total space accounted for: "
@@ -130,7 +132,7 @@ msgstr "Mellemlageret er ude af trit, kan ikke krydsreferere en pakkefil"
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1503
 msgid "Pinned packages:"
-msgstr "'Pinned' pakker:"
+msgstr "»Pinned« pakker:"
 
 #: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
@@ -214,7 +216,7 @@ msgstr ""
 "   showsrc - Vis kildetekstposter\n"
 "   stats - Vis nogle grundlæggende statistikker\n"
 "   dump - Vis hele filen i kort form\n"
-"   dumpavail - Udlæs en 'available'-fil til standard-ud\n"
+"   dumpavail - Udlæs en »available«-fil til standard-ud\n"
 "   unmet - Vis uopfyldte afhængigheder\n"
 "   search - Gennemsøg pakkelisten med et regulært udtryk\n"
 "   show - Vis en læsbar post for pakken\n"
@@ -229,8 +231,8 @@ msgstr ""
 "  -h   Denne hjælpetekst.\n"
 "  -p=? Pakkemellemlageret.\n"
 "  -s=? Kildemellemlageret.\n"
-"  -q   Deaktivér fremgangsindikatoren.\n"
-"  -i   Vis kun vigtige afhængigheder for kommandoen 'unmet'.\n"
+"  -q   Deaktiver fremgangsindikatoren.\n"
+"  -i   Vis kun vigtige afhængigheder for kommandoen »unmet«.\n"
 "  -c=? Læs denne opsætningsfil\n"
 "  -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
 "Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n"
@@ -238,7 +240,7 @@ msgstr ""
 #: cmdline/apt-cdrom.cc:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
-"Angiv venligst et navn for denne disk, som f.eks. 'Debian 5.0.3 Disk 1'"
+"Angiv venligst et navn for denne disk, som f.eks. »Debian 5.0.3 Disk 1«"
 
 #: cmdline/apt-cdrom.cc:94
 msgid "Please insert a Disc in the drive and press enter"
@@ -409,7 +411,7 @@ msgstr ""
 "med .dsc'er. Tvangstilvalget --source-override kan bruges til at\n"
 "angive en src-tvangsfil.\n"
 "\n"
-"Kommandoerne 'packages' og 'sources' skal køres i roden af træet.\n"
+"Kommandoerne »packages« og »sources« skal køres i roden af træet.\n"
 "binærsti skal pege på basen af rekursive søgninger og tvangsfilen\n"
 "skal indeholde tvangsflagene. Sti foranstilles eventuelle\n"
 "filnavnfelter. Et eksempel på brug fra Debianarkivet:\n"
@@ -434,7 +436,7 @@ msgstr "Ingen valg passede"
 #: ftparchive/apt-ftparchive.cc:880
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
-msgstr "Visse filer mangler i pakkefilgruppen '%s'"
+msgstr "Visse filer mangler i pakkefilgruppen »%s«"
 
 #: ftparchive/cachedb.cc:46
 #, c-format
@@ -517,7 +519,7 @@ msgstr " DeLink %s [%s]\n"
 #: ftparchive/writer.cc:275
 #, c-format
 msgid "Failed to readlink %s"
-msgstr "Kunne ikke 'readlink' %s"
+msgstr "Kunne ikke »readlink« %s"
 
 #: ftparchive/writer.cc:279
 #, c-format
@@ -569,19 +571,19 @@ msgid "Unable to open %s"
 msgstr "Kunne ikke åbne %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr "Ugyldig gennemtvangs %s-linje %lu #1"
+msgstr "Ugyldig gennemtvangs %s-linje %llu #1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr "Ugyldig gennemtvangs %s-linje %lu #2"
+msgstr "Ugyldig gennemtvangs %s-linje %llu #2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr "Ugyldig gennemtvangs %s-linje %lu #3"
+msgstr "Ugyldig gennemtvangs %s-linje %llu #3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
@@ -591,7 +593,7 @@ msgstr "Kunne ikke læse gennemtvangsfilen %s"
 #: ftparchive/multicompress.cc:70
 #, c-format
 msgid "Unknown compression algorithm '%s'"
-msgstr "Ukendt komprimeringsalgoritme '%s'"
+msgstr "Ukendt komprimeringsalgoritme »%s«"
 
 #: ftparchive/multicompress.cc:100
 #, c-format
@@ -643,7 +645,7 @@ msgstr "J"
 
 #: cmdline/apt-get.cc:140
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
@@ -749,12 +751,12 @@ msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
 #: cmdline/apt-get.cc:632
 #, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Bemærk, vælger '%s' til opgave '%s'\n"
+msgstr "Bemærk, vælger »%s« til opgave »%s«\n"
 
 #: cmdline/apt-get.cc:637
 #, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Bemærk, vælger '%s' for regulært udtryk '%s'\n"
+msgstr "Bemærk, vælger »%s« for regulært udtryk »%s«\n"
 
 #: cmdline/apt-get.cc:654
 #, c-format
@@ -791,17 +793,17 @@ msgstr "Dog kan følgende pakker erstatte den:"
 #: cmdline/apt-get.cc:709
 #, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr "Pakken '%s' har ingen installationskandidat"
+msgstr "Pakken »%s« har ingen installationskandidat"
 
 #: cmdline/apt-get.cc:720
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "Virtuelle pakker som '%s' kan ikke fjernes\n"
+msgstr "Virtuelle pakker som »%s« kan ikke fjernes\n"
 
 #: cmdline/apt-get.cc:764
 #, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Bemærk, vælger '%s' fremfor '%s'\n"
+msgstr "Bemærk, vælger »%s« fremfor »%s«\n"
 
 #: cmdline/apt-get.cc:794
 #, c-format
@@ -1515,6 +1517,19 @@ msgid ""
 "apt.conf(5) manual pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Brug: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver er en grænseflade, der skal bruge den aktuelle\n"
+"interne som en ekstern problemløser for APT-familien for fejlsøgning\n"
+"eller lignende\n"
+"\n"
+"Tilvalg:\n"
+" -h   Denne hjælpetekst.\n"
+" -q   Logbare uddata - ingen statusindikator\n"
+" -c=? Læs denne konfigurationsfil\n"
+" -o=? Angiv et arbitrærtkonfigurationstilvalg, f.eks. -o dir::cache=/tmp\n"
+"apt.conf(5)-manualsider for yderligere information og indstillinger.\n"
+"                       Denne APT har Super Cow Powers.\n"
 
 #: cmdline/apt-mark.cc:49
 #, c-format
@@ -2323,9 +2338,9 @@ msgid "Couldn't duplicate file descriptor %i"
 msgstr "Kunne ikke duplikere filbeskrivelse %i"
 
 #: apt-pkg/contrib/mmap.cc:117
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr "Kunne ikke udføre mmap for %lu byte"
+msgstr "Kunne ikke udføre mmap for %llu byte"
 
 #: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
@@ -2610,14 +2625,14 @@ msgid "Failed to exec compressor "
 msgstr "Kunne ikke udføre komprimeringsprogram "
 
 #: apt-pkg/contrib/fileutl.cc:1087
-#, fuzzy, c-format
+#, c-format
 msgid "read, still have %llu to read but none left"
-msgstr "læs, mangler stadig at læse %lu men der er ikke flere"
+msgstr "læs, mangler stadig at læse %llu men der er ikke flere"
 
 #: apt-pkg/contrib/fileutl.cc:1152
-#, fuzzy, c-format
+#, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr "skriv, mangler stadig at skrive %lu men kunne ikke"
+msgstr "skriv, mangler stadig at skrive %llu men kunne ikke"
 
 #: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
@@ -2656,9 +2671,8 @@ msgid "The package cache file is an incompatible version"
 msgstr "Pakke-mellemlagerets fil er af en inkompatibel version"
 
 #: apt-pkg/pkgcache.cc:162
-#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr "Pakke-mellemlagerets fil er ødelagt"
+msgstr "Pakke-mellemlagerets fil er ødelagt, den er for lille"
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2837,13 +2851,13 @@ msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
-"Kunne ikke udføre øjeblikkelig konfiguration på '%s'. Se venligst man 5 apt."
+"Kunne ikke udføre øjeblikkelig konfiguration på »%s«. Se venligst man 5 apt."
 "conf under APT:Immediate-Cinfigure for detaljer. (%d)"
 
 #: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
-#, fuzzy, c-format
+#, c-format
 msgid "Could not configure '%s'. "
-msgstr "Kunne ikke åbne filen '%s'"
+msgstr "Kunne ikke åbne filen »%s«. "
 
 #: apt-pkg/packagemanager.cc:507
 #, c-format
@@ -2854,13 +2868,13 @@ msgid ""
 msgstr ""
 "Kørsel af denne installation kræver midlertidig afinstallation af den "
 "essentielle pakke %s grundet en afhængighedsløkke. Det er ofte en dårlig "
-"idé, men hvis du virkelig vil gøre det, kan du aktivere valget 'APT::Force-"
-"LoopBreak'."
+"ide, men hvis du virkelig vil gøre det, kan du aktivere valget »APT::Force-"
+"LoopBreak«."
 
 #: apt-pkg/pkgrecords.cc:34
 #, c-format
 msgid "Index file type '%s' is not supported"
-msgstr "Indeksfiler af typen '%s' understøttes ikke"
+msgstr "Indeksfiler af typen »%s« understøttes ikke"
 
 #: apt-pkg/algorithms.cc:255
 #, c-format
@@ -2998,9 +3012,9 @@ msgstr "Mellemlageret benytter en inkompatibel versionsstyring"
 #: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
 #: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
 #: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr "Der skete en fejl under behandlingen af %s (FindPkg)"
+msgstr "Der opstod en fejl under behandlingen af %s (%s%d)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -3347,23 +3361,23 @@ msgstr ""
 
 #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
 msgid "Send scenario to solver"
-msgstr ""
+msgstr "Send scenarie til problemløser"
 
 #: apt-pkg/edsp.cc:213
 msgid "Send request to solver"
-msgstr ""
+msgstr "Send forespørgsel til problemløser"
 
 #: apt-pkg/edsp.cc:281
 msgid "Prepare for receiving solution"
-msgstr ""
+msgstr "Forbered for modtagelse af løsning"
 
 #: apt-pkg/edsp.cc:288
 msgid "External solver failed without a proper error message"
-msgstr ""
+msgstr "Ekstern problemløser fejlede uden en korrekt fejlbesked"
 
 #: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
 msgid "Execute external solver"
-msgstr ""
+msgstr "Kør ekstern problemløser"
 
 #: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
@@ -3456,7 +3470,7 @@ msgstr "Kører dpkg"
 
 #: apt-pkg/deb/dpkgpm.cc:1351
 msgid "Operation was interrupted before it could finish"
-msgstr ""
+msgstr "Handling blev afbrudt før den kunne afsluttes"
 
 #: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"
@@ -3561,61 +3575,3 @@ msgstr ""
 #: methods/rsh.cc:336
 msgid "Connection closed prematurely"
 msgstr "Forbindelsen lukkedes for hurtigt"
-
-#~ msgid "Note: This is done automatic and on purpose by dpkg."
-#~ msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg."
-
-#~ msgid "Malformed override %s line %lu #1"
-#~ msgstr "Ugyldig gennemtvangs %s-linje %lu #1"
-
-#~ msgid "Malformed override %s line %lu #2"
-#~ msgstr "Ugyldig gennemtvangs %s-linje %lu #2"
-
-#~ msgid "Malformed override %s line %lu #3"
-#~ msgstr "Ugyldig gennemtvangs %s-linje %lu #3"
-
-#~ msgid "decompressor"
-#~ msgstr "dekomprimerings-program"
-
-#~ msgid "read, still have %lu to read but none left"
-#~ msgstr "læs, mangler stadig at læse %lu men der er ikke flere"
-
-#~ msgid "write, still have %lu to write but couldn't"
-#~ msgstr "skriv, mangler stadig at skrive %lu men kunne ikke"
-
-#~ msgid ""
-#~ "Could not perform immediate configuration on already unpacked '%s'. "
-#~ "Please see man 5 apt.conf under APT::Immediate-Configure for details."
-#~ msgstr ""
-#~ "Kunne ikke udføre øjeblikkelig konfiguration på allerede udpakket '%s'. "
-#~ "Se venligst man 5 apt.conf under APT:Immediate-Cinfigure for detaljer."
-
-#~ msgid "Error occurred while processing %s (NewPackage)"
-#~ msgstr "Der skete en fejl under behandlingen af %s (NewPackage)"
-
-#~ msgid "Error occurred while processing %s (UsePackage1)"
-#~ msgstr "Der skete en fejl under behandlingen af %s (UsePackage1)"
-
-#~ msgid "Error occurred while processing %s (NewFileDesc1)"
-#~ msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc1)"
-
-#~ msgid "Error occurred while processing %s (UsePackage2)"
-#~ msgstr "Der skete en fejl under behandlingen af %s (UsePackage2)"
-
-#~ msgid "Error occurred while processing %s (NewFileVer1)"
-#~ msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
-
-#~ msgid "Error occurred while processing %s (NewVersion%d)"
-#~ msgstr "Der skete en fejl under behandlingen af %s (NewVersion%d)"
-
-#~ msgid "Error occurred while processing %s (UsePackage3)"
-#~ msgstr "Der skete en fejl under behandlingen af %s (UsePackage3)"
-
-#~ msgid "Error occurred while processing %s (NewFileDesc2)"
-#~ msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc2)"
-
-#~ msgid "Error occurred while processing %s (FindPkg)"
-#~ msgstr "Der skete en fejl under behandlingen af %s (FindPkg)"
-
-#~ msgid "Error occurred while processing %s (CollectFileProvides)"
-#~ msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)"
diff --git a/po/fr.po b/po/fr.po
index 7d6042082..ebe96861e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,13 +3,13 @@
 # French messages
 #
 # Pierre Machard <pmachard@tuxfamily.org>, 2002,2003,2004.
-# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007, 2008, 2009, 2010, 2011.
+# Christian Perrier <bubulle@debian.org>, 2004-2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: deity@lists.debian.org\n"
 "POT-Creation-Date: 2012-04-11 17:55+0200\n"
-"PO-Revision-Date: 2011-10-24 22:52+0100\n"
+"PO-Revision-Date: 2012-06-02 18:42+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: \n"
@@ -577,19 +577,19 @@ msgid "Unable to open %s"
 msgstr "Impossible d'ouvrir %s"
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr "Entrée « override » %s mal formée ligne %lu n° 1"
+msgstr "Entrée « override » %s mal formée ligne %llu n° 1"
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr "Entrée « override » %s mal formée %lu n° 2"
+msgstr "Entrée « override » %s mal formée %llu n° 2"
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, fuzzy, c-format
+#, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr "Entrée « override » %s mal formée %lu n° 3"
+msgstr "Entrée « override » %s mal formée %llu n° 3"
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
 #, c-format
@@ -651,7 +651,7 @@ msgstr "O"
 
 #: cmdline/apt-get.cc:140
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
 #, c-format
@@ -2355,9 +2355,9 @@ msgid "Couldn't duplicate file descriptor %i"
 msgstr "Impossible de dupliquer le descripteur de fichier %i"
 
 #: apt-pkg/contrib/mmap.cc:117
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr "Impossible de réaliser un mapping de %lu octets en mémoire"
+msgstr "Impossible de réaliser un mapping de %llu octets en mémoire"
 
 #: apt-pkg/contrib/mmap.cc:144
 msgid "Unable to close mmap"
@@ -2655,14 +2655,14 @@ msgid "Failed to exec compressor "
 msgstr "Impossible d'exécuter la compression "
 
 #: apt-pkg/contrib/fileutl.cc:1087
-#, fuzzy, c-format
+#, c-format
 msgid "read, still have %llu to read but none left"
-msgstr "lu(s), %lu restant à lire, mais rien n'est disponible"
+msgstr "lu(s), %llu restant à lire, mais rien n'est disponible"
 
 #: apt-pkg/contrib/fileutl.cc:1152
-#, fuzzy, c-format
+#, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr "écrit(s), %lu restant à écrire, mais l'écriture est impossible"
+msgstr "écrit(s), %llu restant à écrire, mais l'écriture est impossible"
 
 #: apt-pkg/contrib/fileutl.cc:1410
 #, c-format
@@ -2701,9 +2701,8 @@ msgid "The package cache file is an incompatible version"
 msgstr "Le fichier de cache des paquets a une version incompatible"
 
 #: apt-pkg/pkgcache.cc:162
-#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr "Le fichier de cache des paquets est corrompu"
+msgstr "Le fichier de cache des paquets est corrompu, il est trop petit."
 
 #: apt-pkg/pkgcache.cc:167
 #, c-format
@@ -2898,9 +2897,9 @@ msgstr ""
 "APT::Immediate-Configure, pour plus d'informations. (%d)"
 
 #: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
-#, fuzzy, c-format
+#, c-format
 msgid "Could not configure '%s'. "
-msgstr "Impossible d'ouvrir le fichier « %s »"
+msgstr "Impossible de configurer « %s »."
 
 #: apt-pkg/packagemanager.cc:507
 #, c-format
@@ -3064,9 +3063,9 @@ msgstr "Le cache possède un système de version incompatible"
 #: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
 #: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
 #: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr "Erreur apparue lors du traitement de %s (FindPkg)"
+msgstr "Erreur apparue lors du traitement de %s (%s%d)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -3435,23 +3434,23 @@ msgstr ""
 
 #: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
 msgid "Send scenario to solver"
-msgstr ""
+msgstr "Envoi du scénario au solveur"
 
 #: apt-pkg/edsp.cc:213
 msgid "Send request to solver"
-msgstr ""
+msgstr "Envoi d'une requête au solveur"
 
 #: apt-pkg/edsp.cc:281
 msgid "Prepare for receiving solution"
-msgstr ""
+msgstr "Préparation à la réception de la solution"
 
 #: apt-pkg/edsp.cc:288
 msgid "External solver failed without a proper error message"
-msgstr ""
+msgstr "Échec du solveur externe sans message d'erreur adapté"
 
 #: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
 msgid "Execute external solver"
-msgstr ""
+msgstr "Exécu tion du solveur externe"
 
 #: apt-pkg/deb/dpkgpm.cc:71
 #, c-format
@@ -3546,7 +3545,7 @@ msgstr "Exécution de dpkg"
 
 #: apt-pkg/deb/dpkgpm.cc:1351
 msgid "Operation was interrupted before it could finish"
-msgstr ""
+msgstr "L'opération a été interrompue avant de se terminer"
 
 #: apt-pkg/deb/dpkgpm.cc:1408
 msgid "No apport report written because MaxReports is reached already"