merged the lp:~mvo/apt/mvo branch

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 04ace10a63320cc13337c38ffaaf49ec0a797cda..55600fe57e6d40cb456a215dd24a192080fdbb08 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -854,6 +854,7 @@ pkgUdevCdromDevices::Dlopen()                                       /*{{{*/
    libudev_handle = h;
    udev_new = (udev* (*)(void)) dlsym(h, "udev_new");
    udev_enumerate_add_match_property = (int (*)(udev_enumerate*, const char*, const char*))dlsym(h, "udev_enumerate_add_match_property");
+   udev_enumerate_add_match_sysattr = (int (*)(udev_enumerate*, const char*, const char*))dlsym(h, "udev_enumerate_add_match_sysattr");
    udev_enumerate_scan_devices = (int (*)(udev_enumerate*))dlsym(h, "udev_enumerate_scan_devices");
    udev_enumerate_get_list_entry = (udev_list_entry* (*)(udev_enumerate*))dlsym(h, "udev_enumerate_get_list_entry");
    udev_device_new_from_syspath = (udev_device* (*)(udev*, const char*))dlsym(h, "udev_device_new_from_syspath");
@@ -867,8 +868,20 @@ pkgUdevCdromDevices::Dlopen()                                      /*{{{*/
    return true;
 }
                                                                        /*}}}*/
+
+                                                                        /*{{{*/
+// compatiblity only with the old API/ABI, can be removed on the next
+// ABI break
+vector<CdromDevice>
+pkgUdevCdromDevices::Scan()
+{ 
+   bool CdromOnly = _config->FindB("APT::cdrom::CdromOnly", true);
+   return ScanForRemovable(CdromOnly); 
+};
+                                                                       /*}}}*/
+                                                                        /*{{{*/
 vector<CdromDevice>
-pkgUdevCdromDevices::Scan()                                             /*{{{*/
+pkgUdevCdromDevices::ScanForRemovable(bool CdromOnly)
 {
    vector<CdromDevice> cdrom_devices;
    struct udev_enumerate *enumerate;
@@ -880,7 +893,10 @@ pkgUdevCdromDevices::Scan()                                             /*{{{*/
 
    udev_ctx = udev_new();
    enumerate = udev_enumerate_new (udev_ctx);
-   udev_enumerate_add_match_property(enumerate, "ID_CDROM", "1");
+   if (CdromOnly)
+      udev_enumerate_add_match_property(enumerate, "ID_CDROM", "1");
+   else
+      udev_enumerate_add_match_sysattr(enumerate, "removable", "1");
 
    udev_enumerate_scan_devices (enumerate);
    devices = udev_enumerate_get_list_entry (enumerate);
@@ -892,11 +908,18 @@ pkgUdevCdromDevices::Scan()                                             /*{{{*/
       if (udevice == NULL)
         continue;
       const char* devnode = udev_device_get_devnode(udevice);
-      const char* mountpath = udev_device_get_property_value(udevice, "FSTAB_DIR");
+
+      // try fstab_dir first
+      string mountpath;
+      const char* mp = udev_device_get_property_value(udevice, "FSTAB_DIR");
+      if (mp)
+         mountpath = string(mp);
+      else
+         mountpath = FindMountPointForDevice(devnode);
 
       // fill in the struct
       cdrom.DeviceName = string(devnode);
-      if (mountpath) {
+      if (mountpath != "") {
         cdrom.MountPath = mountpath;
         string s = string(mountpath);
         cdrom.Mounted = IsMounted(s);

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 14ca1d8104dc163136e02a68426fca9a0283fdc6..032fae755bcdd9f11d7cda4c5917eb0758c39247 100644 (file)
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -68,7 +68,7 @@ class pkgCdrom                                                                /*{{{*/
                                                                        /*}}}*/
 
 
-// class that uses libudev to find cdrom devices dynamically
+// class that uses libudev to find cdrom/removable devices dynamically
 struct CdromDevice                                                     /*{{{*/
 {
    string DeviceName;
@@ -92,6 +92,7 @@ class pkgUdevCdromDevices                                             /*{{{*/
    struct udev_enumerate *(*udev_enumerate_new) (struct udev *udev);
    struct udev_list_entry *(*udev_list_entry_get_next)(struct udev_list_entry *list_entry);
    const char* (*udev_device_get_property_value)(struct udev_device *udev_device, const char *key);
+   int (*udev_enumerate_add_match_sysattr)(struct udev_enumerate *udev_enumerate, const char *property, const char *value);
    // end libudev dlopen
    
  public:
@@ -100,7 +101,12 @@ class pkgUdevCdromDevices                                          /*{{{*/
 
    // try to open 
    bool Dlopen();
+
+   // this is the new interface
+   vector<CdromDevice> ScanForRemovable(bool CdromOnly);
+   // FIXME: compat with the old interface/API/ABI only
    vector<CdromDevice> Scan();
+
 };
                                                                        /*}}}*/
 

diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index 68b98040722e3b611a03e16d30a227ea015fad40..83c324f543bfdadf035ef21dda531eb2c49a41e1 100644 (file)
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -15,6 +15,7 @@
 #include <apt-pkg/md5.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/strutl.h>
 
 #include <apti18n.h>
     
@@ -234,3 +235,33 @@ bool IdentCdrom(string CD,string &Res,unsigned int Version)
    return true;   
 }
                                                                        /*}}}*/
+
+// FindMountPointForDevice - Find mountpoint for the given device      /*{{{*/
+string FindMountPointForDevice(const char *devnode)
+{
+   char buf[255];
+   char *out[10];
+   int i=0;
+
+   // this is the order that mount uses as well
+   const char *mount[] = { "/etc/mtab", 
+                           "/proc/mount", 
+                           NULL };
+
+   for (i=0; mount[i] != NULL; i++) {
+      if (FileExists(mount[i])) {
+         FILE *f=fopen(mount[i], "r");
+         while ( fgets(buf, sizeof(buf), f) != NULL) {
+            if (strncmp(buf, devnode, strlen(devnode)) == 0) {
+               if(TokSplitString(' ', buf, out, 10))
+                  return string(out[1]);
+            }
+         }
+         fclose(f);
+      }
+   }
+   
+   return string();
+}
+
+

diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h
index 9d14249c53b71fbcfa9d0051dfe60ab308c1ba03..38ed2996ee79d0a3a4b8815c37a525bcaae39476 100644 (file)
--- a/apt-pkg/contrib/cdromutl.h
+++ b/apt-pkg/contrib/cdromutl.h
@@ -19,5 +19,6 @@ bool MountCdrom(string Path, string DeviceName="");
 bool UnmountCdrom(string Path);
 bool IdentCdrom(string CD,string &Res,unsigned int Version = 2);
 bool IsMounted(string &Path);
+string FindMountPointForDevice(const char *device);
 
 #endif

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 767951daf14a4e2eead649dc829e9ec44daa3fa1..50019872e3d3e16fbe81df2698025644e5eac4b3 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -67,6 +67,15 @@ bool RunScripts(const char *Cnf)
    // This is the child
    if (Child == 0)
    {
+      if (_config->FindDir("DPkg::Chroot-Directory","/") != "/") 
+      {
+         std::cerr << "Chrooting into " 
+                   << _config->FindDir("DPkg::Chroot-Directory") 
+                   << std::endl;
+         if (chroot(_config->FindDir("DPkg::Chroot-Directory","/").c_str()) != 0)
+            _exit(100);
+      }
+
       if (chdir("/tmp/") != 0)
         _exit(100);
         

diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index 9961b5ae44178e135c8a2e78b3968db1b43c0281..1e8c040333b028def25e8330b484ab4cb15ac035 100644 (file)
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -66,7 +66,10 @@ pkgSrcRecords::Parser *debSourcesIndex::CreateSrcParser() const
    string SourcesURI = _config->FindDir("Dir::State::lists") + 
       URItoFileName(IndexURI("Sources"));
    string SourcesURIgzip = SourcesURI + ".gz";
-   if (!FileExists(SourcesURI) && FileExists(SourcesURIgzip))
+
+   if (!FileExists(SourcesURI) && !FileExists(SourcesURIgzip))
+      return NULL;
+   else if (!FileExists(SourcesURI) && FileExists(SourcesURIgzip))
       SourcesURI = SourcesURIgzip;
 
    return new debSrcRecordParser(SourcesURI,this);

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 7b0955b96bd8390849df74f5474116d4b5fa81d3..eb9abe909fef1d4b2505a4579842f096443cec27 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -308,6 +308,15 @@ bool pkgDPkgPM::RunScriptsWithPkgs(const char *Cnf)
         SetCloseExec(STDIN_FILENO,false);      
         SetCloseExec(STDERR_FILENO,false);
 
+        if (_config->FindDir("DPkg::Chroot-Directory","/") != "/") 
+        {
+           std::cerr << "Chrooting into " 
+                     << _config->FindDir("DPkg::Chroot-Directory") 
+                     << std::endl;
+           if (chroot(_config->FindDir("DPkg::Chroot-Directory","/").c_str()) != 0)
+              _exit(100);
+        }
+
         const char *Args[4];
         Args[0] = "/bin/sh";
         Args[1] = "-c";

diff --git a/debian/changelog b/debian/changelog
index 238d9d63eb312abef2061783628b51d1a668a7e3..32b74267c3555601609d36a93016422c99f6d1ff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,16 @@
-apt (0.8.11.6) UNRELEASED; urgency=low
+apt (0.8.12) UNRELEASED; urgency=low
+
+  [ Michael Vogt ]
+  * apt-pkg/deb/debindexfile.cc:
+    - ignore missing deb-src files in /var/lib/apt/lists, thanks
+      to Thorsten Spindler (LP: #85590)
+  * apt-pkg/contrib/fileutl.cc, apt-pkg/deb/dpkgpm.cc:
+    - honor Dpkg::Chroot-Directory in the RunScripts*() methods
+  * apt-pkg/contrib/cdromutl.{cc,h}, apt-pkg/cdrom.{cc,h}:
+    - deal with missing FSTAB_DIR when using libudev to discover cdrom
+    - add experimental APT::cdrom::CdromOnly option (on by default). 
+      When this is set to false apt-cdrom will handle any removable
+      deivce (like a usb-stick) as a "cdrom/dvd" source
 
   [ Christian Perrier ]
   * Fix error in French translation of manpages (apt_preferences(5)).

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 6119d67d081e4f4b392d10b3c19c9c2328ab5923..6884e06e32d82f3c6703aff7162f6957c787d092 100644 (file)
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -265,7 +265,10 @@ Acquire
   cdrom
   {
     // do auto detection of the cdrom mountpoint
-    AutoDetect "true";
+    AutoDetect "true";   
+    // when auto-detecting, only look for cdrom/dvd. when this is false
+    // it will support any removable device as a "cdrom" source
+    CdromOnly "true";
     
     // cdrom mountpoint (needs to be defined in fstab if AutoDetect is not used)
     mount "/cdrom";
@@ -385,7 +388,6 @@ DPkg
 {
    // let apt aggressivly use dpkg triggers
    NoTriggers "true";
-   NoConfigure "true";
    ConfigurePending "true";
 
    // Probably don't want to use force-downgrade..

diff --git a/doc/po/fr.po b/doc/po/fr.po
index 660bc740a40a5da439a315d597bec68a983d08b7..e2216cf311782345304c29f5cb6e80029d137cc4 100644 (file)
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -651,12 +651,9 @@ msgstr ""
 "     traduction est légèrement en retard sur le contenu d'origine.\n"
 "\">\n"
 
-#.  The last update date
+#.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-cache.8.xml:16
-#| msgid ""
-#| "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; "
-#| "<date>14 February 2004</date>"
 msgid ""
 "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
 "February 2011</date>"
@@ -691,28 +688,6 @@ msgstr "recherche dans le cache d'APT"
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: apt-cache.8.xml:39
-#| msgid ""
-#| "<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-#| "<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#| "choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>file</replaceable></arg></arg> <arg>gencaches</arg> "
-#| "<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>stats</arg> <arg>dump</"
-#| "arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain"
-#| "\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-#| "<arg>depends <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg>pkgnames <arg choice="
-#| "\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg>xvcg <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-#| "replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice="
-#| "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </"
-#| "group>"
 msgid ""
 "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
 "o=<replaceable>config string</replaceable></option></arg> <arg><option>-"
@@ -737,14 +712,21 @@ msgstr ""
 "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-"
 "o=<replaceable>option de configuration</replaceable></option></arg> "
 "<arg><option>-c=<replaceable>fichier</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>gencaches</arg> "
-"<arg>showpkg <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg>showsrc <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg>stats</arg> <arg>"
-"dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg>"
-"</arg> <arg>depends "
-"<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg>rdepends <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg>pkgnames <arg choice="
-"\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquets</replaceable></arg></arg> <arg>madison <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>paquets</replaceable></arg></arg> </group>"
+"choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" rep="
+"\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg>showsrc <arg "
+"choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></"
+"arg> <arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
+"<arg>search <arg choice=\"plain\"><replaceable>regex</replaceable></arg></"
+"arg> <arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</"
+"replaceable></arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>paquet</replaceable></arg></arg> <arg>rdepends <arg choice="
+"\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> "
+"<arg>pkgnames <arg choice=\"plain\"><replaceable>prefix</replaceable></arg></"
+"arg> <arg>dotty <arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</"
+"replaceable></arg></arg> <arg>policy <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>paquets</replaceable></arg></arg> <arg>madison <arg choice="
+"\"plain\" rep=\"repeat\"><replaceable>paquets</replaceable></arg></arg> </"
+"group>"
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50
@@ -1870,7 +1852,7 @@ msgstr ""
 "<command>apt-cdrom</command> renvoie zéro après un déroulement normal, et le "
 "nombre décimal 100 en cas d'erreur."
 
-#.  The last update date
+#.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-config.8.xml:16 apt-extracttemplates.1.xml:16 apt-sortpkgs.1.xml:16
 #: sources.list.5.xml:16
@@ -2095,7 +2077,7 @@ msgstr ""
 "<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, "
 "le nombre 100 en cas d'erreur."
 
-#.  The last update date
+#.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-ftparchive.1.xml:16
 msgid ""
@@ -2221,7 +2203,8 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
-msgid "The option <option>--db</option> can be used to specify a binary caching DB."
+msgid ""
+"The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 "On peut se servir de l'option <option>--db</option> pour demander un cache "
 "binaire."
@@ -2298,13 +2281,17 @@ msgid ""
 "literal>.  It then writes to stdout a Release file containing a MD5, SHA1 "
 "and SHA256 digest for each file."
 msgstr ""
-"La commande <literal>release</literal> crée un fichier Release à partir d'une arborescence. Elle recherche récursivement dans le répertoire indiqué des fichiers <filename>Packages</filename> et <filename>Sources<"
-"/filename> non compressés et compressés avec <command>gzip</command>, <command>bzip2</command> ou "
-"<command>lzma</command> ainsi que des fichiers <filename>Release</filename> et "
-"<filename>md5sum.txt</filename> par défaut (<literal>APT::FTPArchive::"
-"Release::Default-Patterns</literal>). Des motifs supplémentaires pour les noms de fichiers peuvent être ajoutés en les mentionnant dans  <literal>APT::FTPArchive::Release::Patterns</"
-"literal>.  Le fichier Release est ensuite affiché et comporte des sommes de contrôle MD5, SHA1 "
-"et SHA256 pour chaque fichier."
+"La commande <literal>release</literal> crée un fichier Release à partir "
+"d'une arborescence. Elle recherche récursivement dans le répertoire indiqué "
+"des fichiers <filename>Packages</filename> et <filename>Sources</filename> "
+"non compressés et compressés avec <command>gzip</command>, <command>bzip2</"
+"command> ou <command>lzma</command> ainsi que des fichiers "
+"<filename>Release</filename> et <filename>md5sum.txt</filename> par défaut "
+"(<literal>APT::FTPArchive::Release::Default-Patterns</literal>). Des motifs "
+"supplémentaires pour les noms de fichiers peuvent être ajoutés en les "
+"mentionnant dans  <literal>APT::FTPArchive::Release::Patterns</literal>.  Le "
+"fichier Release est ensuite affiché et comporte des sommes de contrôle MD5, "
+"SHA1 et SHA256 pour chaque fichier."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-ftparchive.1.xml:125
@@ -2385,8 +2372,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-ftparchive.1.xml:163
-msgid "The generate configuration has 4 separate sections, each described below."
-msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous."
+msgid ""
+"The generate configuration has 4 separate sections, each described below."
+msgstr ""
+"Ce fichier de configuration possède quatre sections, décrites ci-dessous."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt-ftparchive.1.xml:165
@@ -3344,7 +3333,7 @@ msgstr ""
 "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
 "nombre 100 en cas d'erreur."
 
-#.  The last update date
+#.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-get.8.xml:16
 msgid ""
@@ -3362,7 +3351,8 @@ msgstr "apt-get"
 #. type: Content of: <refentry><refnamediv><refpurpose>
 #: apt-get.8.xml:33
 msgid "APT package handling utility -- command-line interface"
-msgstr "Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
+msgstr ""
+"Utilitaire APT pour la gestion des paquets -- interface en ligne de commande."
 
 #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
 #: apt-get.8.xml:39
@@ -3812,7 +3802,9 @@ msgstr "download"
 msgid ""
 "<literal>download</literal> will download the given binary package into the "
 "current directoy."
-msgstr "<literal>download</literal> télécharge le fichier binaire indiqué dans le répertoire courant."
+msgstr ""
+"<literal>download</literal> télécharge le fichier binaire indiqué dans le "
+"répertoire courant."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:288
@@ -3890,10 +3882,15 @@ msgid ""
 "installed.  However, you can specify the same options as for the "
 "<option>install</option> command."
 msgstr ""
-"<literal>changelog</literal> télécharge le journal des modifications d'un paquet et l'affiche avec <command>sensible-pager</command>. Le nom du serveur et le répertoire de base sont définis dans la variable <"
-"literal>APT::Changelogs::Server</literal> (p. ex. <ulink>http://packages.debian.org/changelogs</ulink> pour "
-"Debian ou <ulink>http://changelogs.ubuntu.com/changelogs</ulink> pour Ubuntu). Par défaut, c'est le journal des modifications de la version installée du paquet qui est affiché. Cependant, il est possible d'utiliser "
-"les mêmes options que pour la commande <option>install</option>."
+"<literal>changelog</literal> télécharge le journal des modifications d'un "
+"paquet et l'affiche avec <command>sensible-pager</command>. Le nom du "
+"serveur et le répertoire de base sont définis dans la variable <literal>APT::"
+"Changelogs::Server</literal> (p. ex. <ulink>http://packages.debian.org/"
+"changelogs</ulink> pour Debian ou <ulink>http://changelogs.ubuntu.com/"
+"changelogs</ulink> pour Ubuntu). Par défaut, c'est le journal des "
+"modifications de la version installée du paquet qui est affiché. Cependant, "
+"il est possible d'utiliser les mêmes options que pour la commande "
+"<option>install</option>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-get.8.xml:335
@@ -3911,21 +3908,17 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-get.8.xml:340
-#| msgid "<option>--no-suggests</option>"
 msgid "<option>--install-suggests</option>"
 msgstr "<option>--install-suggests</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-get.8.xml:341
-#| msgid ""
-#| "Do not consider recommended packages as a dependency for installing.  "
-#| "Configuration Item: <literal>APT::Install-Recommends</literal>."
 msgid ""
 "Consider suggested packages as a dependency for installing.  Configuration "
 "Item: <literal>APT::Install-Suggests</literal>."
 msgstr ""
-"Considérer les paquets suggérés comme des dépendances à installer. "
-"Élément de configuration : <literal>APT::Install-Suggests</literal>."
+"Considérer les paquets suggérés comme des dépendances à installer. Élément "
+"de configuration : <literal>APT::Install-Suggests</literal>."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-get.8.xml:345
@@ -4753,8 +4746,10 @@ msgstr "Trousseau des clés fiables de l'archive Debian."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-key.8.xml:169
-msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
-msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+msgid ""
+"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
+msgstr ""
+"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-key.8.xml:170
@@ -4766,7 +4761,7 @@ msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
 msgid "&apt-get;, &apt-secure;"
 msgstr "&apt-get;, &apt-secure;"
 
-#.  The last update date
+#.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt-mark.8.xml:16
 msgid ""
@@ -4876,8 +4871,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-mark.8.xml:96
-msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
+msgid ""
+"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
+msgstr ""
+"<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-mark.8.xml:97
@@ -5152,13 +5149,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt-secure.8.xml:147
-#| msgid ""
-#| "In order to add a new key you need to first download it (you should make "
-#| "sure you are using a trusted communication channel when retrieving it), "
-#| "add it with <command>apt-key</command> and then run <command>apt-get "
-#| "update</command> so that apt can download and verify the "
-#| "<filename>Release.gpg</filename> files from the archives you have "
-#| "configured."
 msgid ""
 "In order to add a new key you need to first download it (you should make "
 "sure you are using a trusted communication channel when retrieving it), add "
@@ -5171,7 +5161,8 @@ msgstr ""
 "utiliser un canal fiable pour ce téléchargement. Ensuite vous l'ajoutez avec "
 "la commande <command>apt-key</command> et vous lancez la commande "
 "<command>apt-get update</command> pour télécharger et vérifier le fichier "
-"<filename>InRelease</filename> ou <filename>Release.gpg</filename> de l'archive que vous avez configurée."
+"<filename>InRelease</filename> ou <filename>Release.gpg</filename> de "
+"l'archive que vous avez configurée."
 
 #. type: Content of: <refentry><refsect1><title>
 #: apt-secure.8.xml:156
@@ -5200,16 +5191,14 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml:168
-#| msgid ""
-#| "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -"
-#| "abs -o Release.gpg Release</command>."
 msgid ""
 "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg --"
 "clearsign -o InRelease Release</command> and <command>gpg -abs -o Release."
 "gpg Release</command>."
 msgstr ""
-"<emphasis>le signer</emphasis>, avec les commande <command>gpg -- clearsign -o InRelease Release</command> et <command>gpg -abs -o "
-"Release.gpg Release</command>."
+"<emphasis>le signer</emphasis>, avec les commande <command>gpg -- clearsign -"
+"o InRelease Release</command> et <command>gpg -abs -o Release.gpg Release</"
+"command>."
 
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-secure.8.xml:172
@@ -5338,7 +5327,7 @@ msgstr ""
 "<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 "
 "en cas d'erreur."
 
-#.  The last update date
+#.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt.conf.5.xml:16
 msgid ""
@@ -5402,11 +5391,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml:52
-#| msgid ""
-#| "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
-#| "order which have no or \"<literal>conf</literal>\" as filename extension "
-#| "and which only contain alphanumeric, hyphen (-), underscore (_) and "
-#| "period (.) characters - otherwise they will be silently ignored."
 msgid ""
 "all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
 "order which have no or \"<literal>conf</literal>\" as filename extension and "
@@ -5419,13 +5403,18 @@ msgstr ""
 "alphanumérique ascendant qui ont soit l'extension \"<literal>conf</literal>"
 "\", soit aucune extension et qui ne contiennent que des caractères "
 "alphanumériques, des tirets (-), des caractères de soulignement (_) et des "
-"points (.), les autres fichiers étant ignorés. Dans le cas contraire, APT affichera un avertissement indiquant qu'il a ignoré un fichier si celui-ci ne correspond par à un motif défini dans <literal>"
-"Dir::Ignore-Files-Silently</literal> (les fichiers correspondant à cette variable de configuration étant, eux, ignorés silencieusemennt)."
+"points (.), les autres fichiers étant ignorés. Dans le cas contraire, APT "
+"affichera un avertissement indiquant qu'il a ignoré un fichier si celui-ci "
+"ne correspond par à un motif défini dans <literal>Dir::Ignore-Files-"
+"Silently</literal> (les fichiers correspondant à cette variable de "
+"configuration étant, eux, ignorés silencieusemennt)."
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml:59
-msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
-msgstr "le fichier de configuration défini par <literal>Dir::Etc::Main</literal>"
+msgid ""
+"the main configuration file specified by <literal>Dir::Etc::main</literal>"
+msgstr ""
+"le fichier de configuration défini par <literal>Dir::Etc::Main</literal>"
 
 #. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
 #: apt.conf.5.xml:61
@@ -6444,17 +6433,6 @@ msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:442
-#| msgid ""
-#| "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
-#| "replaceable></literal> will be checked: If this setting exists the method "
-#| "will only be used if this file exists, e.g. for the bzip2 method (the "
-#| "inbuilt) setting is <placeholder type=\"literallayout\" id=\"0\"/> Note "
-#| "also that list entries specified on the command line will be added at the "
-#| "end of the list specified in the configuration files, but before the "
-#| "default entries. To prefer a type in this case over the ones specified in "
-#| "in the configuration files you can set the option direct - not in list "
-#| "style.  This will not override the defined list, it will only prefix the "
-#| "list with this type."
 msgid ""
 "Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
 "replaceable></literal> will be checked: If this setting exists the method "
@@ -6486,8 +6464,10 @@ msgid ""
 "uncompressed files a preference, but note that most archives doesn't provide "
 "uncompressed files so this is mostly only useable for local mirrors."
 msgstr ""
-"Le type spécial <literal>uncompressed</literal> peut servir à donner la préférence aux fichiers non compressés. Veuillez noter que la plupart des archives ne fournissent pas de fichiers non compressés, donc ce "
-"réglage est surtout destiné aux miroirs locaux."
+"Le type spécial <literal>uncompressed</literal> peut servir à donner la "
+"préférence aux fichiers non compressés. Veuillez noter que la plupart des "
+"archives ne fournissent pas de fichiers non compressés, donc ce réglage est "
+"surtout destiné aux miroirs locaux."
 
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: apt.conf.5.xml:454
@@ -6926,18 +6906,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt.conf.5.xml:621
-#| msgid ""
-#| "APT can call dpkg in a way so it can make aggressive use of triggers over "
-#| "multiply calls of dpkg. Without further options dpkg will use triggers "
-#| "only in between his own run. Activating these options can therefore "
-#| "decrease the time needed to perform the install / upgrade. Note that it "
-#| "is intended to activate these options per default in the future, but as "
-#| "it changes the way APT calling dpkg drastically it needs a lot more "
-#| "testing.  <emphasis>These options are therefore currently experimental "
-#| "and should not be used in productive environments.</emphasis> Also it "
-#| "breaks the progress reporting so all frontends will currently stay around "
-#| "half (or more) of the time in the 100% state while it actually configures "
-#| "all packages."
 msgid ""
 "APT can call dpkg in a way so it can make aggressive use of triggers over "
 "multiple calls of dpkg. Without further options dpkg will use triggers only "
@@ -7261,7 +7229,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:750
 msgid ""
@@ -7283,7 +7251,8 @@ msgstr "<literal>Debug::Acquire::cdrom</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:769
-msgid "Print information related to accessing <literal>cdrom://</literal> sources."
+msgid ""
+"Print information related to accessing <literal>cdrom://</literal> sources."
 msgstr ""
 "Affiche les informations concernant les sources de type <literal>cdrom://</"
 "literal>"
@@ -7296,7 +7265,8 @@ msgstr "<literal>Debug::Acquire::ftp</literal>"
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:780
 msgid "Print information related to downloading packages using FTP."
-msgstr "Affiche les informations concernant le téléchargement de paquets par FTP."
+msgstr ""
+"Affiche les informations concernant le téléchargement de paquets par FTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.conf.5.xml:787
@@ -7306,7 +7276,8 @@ msgstr "<literal>Debug::Acquire::http</literal>"
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:791
 msgid "Print information related to downloading packages using HTTP."
-msgstr "Affiche les informations concernant le téléchargement de paquets par HTTP."
+msgstr ""
+"Affiche les informations concernant le téléchargement de paquets par HTTP."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt.conf.5.xml:798
@@ -7467,7 +7438,8 @@ msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:920
-msgid "Log all interactions with the sub-processes that actually perform downloads."
+msgid ""
+"Log all interactions with the sub-processes that actually perform downloads."
 msgstr ""
 "Affiche toutes les interactions avec les processus enfants qui se chargent "
 "effectivement des téléchargements."
@@ -7608,7 +7580,8 @@ msgstr "<literal>Debug::pkgPackageManager</literal>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml:1021
-msgid "Output status messages tracing the steps performed when invoking &dpkg;."
+msgid ""
+"Output status messages tracing the steps performed when invoking &dpkg;."
 msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -7679,17 +7652,19 @@ msgstr ""
 msgid "&file-aptconf;"
 msgstr "&file-aptconf;"
 
-#.  ? reading apt.conf
+#.  ? reading apt.conf 
 #. type: Content of: <refentry><refsect1><para>
 #: apt.conf.5.xml:1100
 msgid "&apt-cache;, &apt-config;, &apt-preferences;."
 msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
 
-#.  The last update date
+#.  The last update date 
 #. type: Content of: <refentry><refentryinfo>
 #: apt_preferences.5.xml:16
-msgid "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
-msgstr "&apt-author.team; &apt-email; &apt-product; <date>16 février 2010</date>"
+msgid ""
+"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
+msgstr ""
+"&apt-author.team; &apt-email; &apt-product; <date>16 février 2010</date>"
 
 #. type: Content of: <refentry><refnamediv><refname>
 #: apt_preferences.5.xml:24 apt_preferences.5.xml:31
@@ -7774,13 +7749,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><para>
 #: apt_preferences.5.xml:70
-#| msgid ""
-#| "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
-#| "directory are parsed in alphanumeric ascending order and need to obey the "
-#| "following naming convention: The files have no or \"<literal>pref</"
-#| "literal>\" as filename extension and which only contain alphanumeric, "
-#| "hyphen (-), underscore (_) and period (.) characters - otherwise they "
-#| "will be silently ignored."
 msgid ""
 "Note that the files in the <filename>/etc/apt/preferences.d</filename> "
 "directory are parsed in alphanumeric ascending order and need to obey the "
@@ -7795,8 +7763,11 @@ msgstr ""
 "d</filename> sont analysés par ordre alphanumérique ascendant, doivent avoir "
 "l'extension \"<literal>pref</literal>\" ou aucune extension et ne peuvent "
 "continir que des caractères alphanumériques, des tirets (-), des caractères "
-"de soulignement (_) et des points (.). Dans le cas contraire, APT affichera un avertissement indiquant qu'il a ignoré un fichier si celui-ci ne correspond par à un motif défini dans <literal>"
-"Dir::Ignore-Files-Silently</literal> (les fichiers correspondant à cette variable de configuration étant, eux, ignorés silencieusemennt)."
+"de soulignement (_) et des points (.). Dans le cas contraire, APT affichera "
+"un avertissement indiquant qu'il a ignoré un fichier si celui-ci ne "
+"correspond par à un motif défini dans <literal>Dir::Ignore-Files-Silently</"
+"literal> (les fichiers correspondant à cette variable de configuration "
+"étant, eux, ignorés silencieusemennt)."
 
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml:79
@@ -7887,7 +7858,8 @@ msgstr "une priorité égale à 990"
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
 #: apt_preferences.5.xml:123
-msgid "to the versions that are not installed and belong to the target release."
+msgid ""
+"to the versions that are not installed and belong to the target release."
 msgstr ""
 "est affectée aux versions qui ne sont pas installées et qui appartiennent à "
 "la distribution par défaut."
@@ -8402,7 +8374,8 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><refsect2><title>
 #: apt_preferences.5.xml:344
 msgid "Determination of Package Version and Distribution Properties"
-msgstr "Détermination de la version des paquets et des propriétés des distributions"
+msgstr ""
+"Détermination de la version des paquets et des propriétés des distributions"
 
 #. type: Content of: <refentry><refsect1><refsect2><para>
 #: apt_preferences.5.xml:346
@@ -9023,13 +8996,6 @@ msgstr "sources.list.d"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:54
-#| msgid ""
-#| "The <filename>/etc/apt/sources.list.d</filename> directory provides a way "
-#| "to add sources.list entries in separate files.  The format is the same as "
-#| "for the regular <filename>sources.list</filename> file.  File names need "
-#| "to end with <filename>.list</filename> and may only contain letters (a-z "
-#| "and A-Z), digits (0-9), underscore (_), hyphen (-) and period (.) "
-#| "characters.  Otherwise they will be silently ignored."
 msgid ""
 "The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
 "add sources.list entries in separate files.  The format is the same as for "
@@ -9046,8 +9012,11 @@ msgstr ""
 "fichier <filename>sources.list</filename>. Les noms de fichiers doivent se "
 "terminer par <filename>.list</filename> et ne peuvent contenir que des "
 "lettres (a-z et A-Z), des chiffres (0-9), des caractères de soulignement "
-"(_), des tirets et des points. Dans le cas contraire, APT affichera un avertissement indiquant qu'il a ignoré un fichier si celui-ci ne correspond par à un motif défini dans <literal>Dir::Ignore-Files-Silently<"
-"/literal> (les fichiers correspondant à cette variable de configuration étant, eux, ignorés silencieusemennt)."
+"(_), des tirets et des points. Dans le cas contraire, APT affichera un "
+"avertissement indiquant qu'il a ignoré un fichier si celui-ci ne correspond "
+"par à un motif défini dans <literal>Dir::Ignore-Files-Silently</literal> "
+"(les fichiers correspondant à cette variable de configuration étant, eux, "
+"ignorés silencieusemennt)."
 
 #. type: Content of: <refentry><refsect1><title>
 #: sources.list.5.xml:65
@@ -9056,16 +9025,6 @@ msgstr "Les types deb et deb-src."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:66
-#| msgid ""
-#| "The <literal>deb</literal> type describes a typical two-level Debian "
-#| "archive, <filename>distribution/component</filename>. Typically, "
-#| "<literal>distribution</literal> is generally one of <literal>stable</"
-#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
-#| "component is one of <literal>main</literal> <literal>contrib</literal> "
-#| "<literal>non-free</literal> or <literal>non-us</literal>. The "
-#| "<literal>deb-src</literal> type describes a debian distribution's source "
-#| "code in the same form as the <literal>deb</literal> type.  A <literal>deb-"
-#| "src</literal> line is required to fetch source indexes."
 msgid ""
 "The <literal>deb</literal> type describes a typical two-level Debian "
 "archive, <filename>distribution/component</filename>. Typically, "
@@ -9080,14 +9039,15 @@ msgid ""
 msgstr ""
 "Le type <literal>deb</literal> décrit une archive Debian classique à deux "
 "niveaux, <filename>distribution/composant</filename>. <literal>distribution</"
-"literal> peut prendre l'une des valeurs suivantes : un nom d'archive tel que <literal>stable</"
-"literal> ou <literal>testing</literal> ou bien un nom de code comme <literal>&stable-codename;</literal> ou <literal>&testing-codename;</ literal>, alors que "
-"composant prend les valeurs : <literal>main</literal>, <literal>contrib</literal> ou "
-"<literal>non-free</literal>.  Le type "
-"<literal>deb-src</literal> décrit une archive de distribution de code source "
-"pour une distribution Debian dans le même format que le type <literal>deb</"
-"literal>. Une ligne <literal>deb-src</literal> est nécessaire pour récupérer "
-"les index des sources."
+"literal> peut prendre l'une des valeurs suivantes : un nom d'archive tel que "
+"<literal>stable</literal> ou <literal>testing</literal> ou bien un nom de "
+"code comme <literal>&stable-codename;</literal> ou <literal>&testing-"
+"codename;</ literal>, alors que composant prend les valeurs : <literal>main</"
+"literal>, <literal>contrib</literal> ou <literal>non-free</literal>.  Le "
+"type <literal>deb-src</literal> décrit une archive de distribution de code "
+"source pour une distribution Debian dans le même format que le type "
+"<literal>deb</literal>. Une ligne <literal>deb-src</literal> est nécessaire "
+"pour récupérer les index des sources."
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:78
@@ -9436,20 +9396,11 @@ msgstr "deb ftp://ftp.debian.org/debian unstable contrib"
 #. type: Content of: <refentry><refsect1><para><literallayout>
 #: sources.list.5.xml:230
 #, no-wrap
-#| msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/"
 msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 msgstr "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:223
-#| msgid ""
-#| "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-"
-#| "US directory, and uses only files found under <filename>unstable/binary-"
-#| "i386</filename> on i386 machines, <filename>unstable/binary-m68k</"
-#| "filename> on m68k, and so forth for other supported architectures. [Note "
-#| "this example only illustrates how to use the substitution variable; non-"
-#| "us is no longer structured like this] <placeholder type=\"literallayout\" "
-#| "id=\"0\"/>"
 msgid ""
 "Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
 "directory, and uses only files found under <filename>unstable/binary-i386</"
@@ -9462,11 +9413,11 @@ msgstr ""
 "Utiliser HTTP pour accéder à l'archive située à ftp.tlh.debian.org, dans le "
 "répertoire universe, et n'utiliser que les fichiers trouvés dans "
 "<filename>unstable/binary-i386</filename> pour les machines i386, dans "
-"<filename>unstable/binary-amd64</filename> pour les machines amd64 et ainsi de "
-"suite pour les autres architectures reconnues. [Notez que cet exemple montre "
-"seulement la manière d'utiliser la variable à substituer, les archives Debian n'étant "
-"plas structurées de cette manière.] <placeholder type=\"literallayout\" id="
-"\"0\"/>"
+"<filename>unstable/binary-amd64</filename> pour les machines amd64 et ainsi "
+"de suite pour les autres architectures reconnues. [Notez que cet exemple "
+"montre seulement la manière d'utiliser la variable à substituer, les "
+"archives Debian n'étant plas structurées de cette manière.] <placeholder "
+"type=\"literallayout\" id=\"0\"/>"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml:235
@@ -9490,7 +9441,8 @@ msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
 
 #. type: <abstract></abstract>
 #: guide.sgml:11
-msgid "This document provides an overview of how to use the the APT package manager."
+msgid ""
+"This document provides an overview of how to use the the APT package manager."
 msgstr ""
 "Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de "
 "paquets APT."
@@ -10396,8 +10348,10 @@ msgstr "Résumé final"
 
 #. type: <p></p>
 #: guide.sgml:447
-msgid "Finally, APT will print out a summary of all the changes that will occur."
-msgstr "Enfin, APT affichera un résumé de toutes les opérations qui prendront place."
+msgid ""
+"Finally, APT will print out a summary of all the changes that will occur."
+msgstr ""
+"Enfin, APT affichera un résumé de toutes les opérations qui prendront place."
 
 #. type: <example></example>
 #: guide.sgml:452
@@ -11090,8 +11044,12 @@ msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 #~ "Utiliser HTTP pour accéder à l'archive située à nonus.debian.org, dans le "
 #~ "répertoire debian-non-US."
 
-#~ msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
-#~ msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free"
+#~ msgid ""
+#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
+#~ "free"
+#~ msgstr ""
+#~ "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-"
+#~ "free"
 
 #~ msgid "OPTIONS"
 #~ msgstr "OPTIONS"