[apt-proxy-devel] r627 - trunk/doc/po

Chris Halls halls at costa.debian.org
Mon Aug 14 12:48:01 UTC 2006


Author: halls
Date: Mon Aug 14 12:48:00 2006
New Revision: 627

Modified:
   trunk/doc/po/apt-proxy.pot
   trunk/doc/po/fr.po

Log:
Automatic update


Modified: trunk/doc/po/apt-proxy.pot
==============================================================================
--- trunk/doc/po/apt-proxy.pot	(original)
+++ trunk/doc/po/apt-proxy.pot	Mon Aug 14 12:48:00 2006
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-03-29  0:11+0200\n"
+"POT-Creation-Date: 2006-08-14 12:59+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -14,14 +14,12 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING"
 
-#.  Man page copied from apt.conf man page.
 # type: TH
 #: doc/apt-proxy.8:2 doc/apt-proxy.8:2 doc/apt-proxy.conf.5:2
 #, no-wrap
 msgid "apt-proxy"
 msgstr ""
 
-#.  Man page copied from apt.conf man page.
 # type: TH
 #: doc/apt-proxy.8:2
 #, no-wrap
@@ -40,7 +38,7 @@
 msgstr ""
 
 # type: SH
-#: doc/apt-proxy.8:5 doc/apt-proxy-v1tov2.8:4 doc/apt-proxy-import.8:5
+#: doc/apt-proxy.8:5 doc/apt-proxy-import.8:5 doc/apt-proxy-v1tov2.8:4
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr ""
@@ -51,7 +49,7 @@
 msgstr ""
 
 # type: SH
-#: doc/apt-proxy.8:10 doc/apt-proxy-v1tov2.8:8 doc/apt-proxy-import.8:8 doc/apt-proxy.conf.5:6
+#: doc/apt-proxy.8:10 doc/apt-proxy.conf.5:6 doc/apt-proxy-import.8:8 doc/apt-proxy-v1tov2.8:8
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
@@ -66,7 +64,7 @@
 msgstr ""
 
 # type: TP
-#: doc/apt-proxy.8:16 doc/apt-proxy-import.8:29
+#: doc/apt-proxy.8:16 doc/apt-proxy-import.8:27
 #, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr ""
@@ -77,7 +75,7 @@
 msgstr ""
 
 # type: TP
-#: doc/apt-proxy.8:19 doc/apt-proxy-import.8:32
+#: doc/apt-proxy.8:19 doc/apt-proxy-import.8:30
 #, no-wrap
 msgid "B<-c>, B<--config-file=>"
 msgstr ""
@@ -161,7 +159,7 @@
 msgstr ""
 
 # type: SH
-#: doc/apt-proxy.8:56 doc/apt-proxy-v1tov2.8:18 doc/apt-proxy-import.8:66 doc/apt-proxy.conf.5:186
+#: doc/apt-proxy.8:56 doc/apt-proxy.conf.5:203 doc/apt-proxy-import.8:61 doc/apt-proxy-v1tov2.8:18
 #, no-wrap
 msgid "FILES"
 msgstr ""
@@ -172,7 +170,7 @@
 msgstr ""
 
 # type: SH
-#: doc/apt-proxy.8:61 doc/apt-proxy-v1tov2.8:24 doc/apt-proxy-import.8:77 doc/apt-proxy.conf.5:190
+#: doc/apt-proxy.8:61 doc/apt-proxy.conf.5:207 doc/apt-proxy-import.8:72 doc/apt-proxy-v1tov2.8:24
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -183,7 +181,7 @@
 msgstr ""
 
 # type: SH
-#: doc/apt-proxy.8:68 doc/apt-proxy-import.8:68 doc/apt-proxy.conf.5:199
+#: doc/apt-proxy.8:68 doc/apt-proxy.conf.5:216 doc/apt-proxy-import.8:63
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -197,7 +195,7 @@
 msgstr ""
 
 # type: SH
-#: doc/apt-proxy.8:73 doc/apt-proxy-v1tov2.8:22 doc/apt-proxy-import.8:75
+#: doc/apt-proxy.8:73 doc/apt-proxy-import.8:70 doc/apt-proxy-v1tov2.8:22
 #, no-wrap
 msgid "AUTHORS"
 msgstr ""
@@ -210,737 +208,755 @@
 msgstr ""
 
 # type: TH
-#: doc/apt-proxy-v1tov2.8:1
-#, no-wrap
-msgid "APT-PROXY-V1TOV2"
-msgstr ""
-
-# type: TH
-#: doc/apt-proxy-v1tov2.8:1
-#, no-wrap
-msgid "November 2002"
-msgstr ""
-
-#.  DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-# type: TH
-#: doc/apt-proxy-v1tov2.8:1 doc/apt-proxy-import.8:2
+#: doc/apt-proxy.conf.5:2
 #, no-wrap
-msgid "Debian GNU/Linux"
+msgid "apt-proxy\\&.conf"
 msgstr ""
 
-#.  DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
 # type: TH
-#: doc/apt-proxy-v1tov2.8:1 doc/apt-proxy-import.8:2
+#: doc/apt-proxy.conf.5:2
 #, no-wrap
-msgid "  "
+msgid "5 Jan 2006"
 msgstr ""
 
 # type: SH
-#: doc/apt-proxy-v1tov2.8:2 doc/apt-proxy-import.8:3 doc/apt-proxy.conf.5:3
+#: doc/apt-proxy.conf.5:3 doc/apt-proxy-import.8:3 doc/apt-proxy-v1tov2.8:2
 #, no-wrap
 msgid "NAME"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-v1tov2.8:4
-msgid "apt-proxy-v1tov2 - Updates apt-proxy configuration to the new format."
+#: doc/apt-proxy.conf.5:5
+msgid "apt-proxy\\&.conf - configuration file for apt-proxy"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-v1tov2.8:7
-msgid "B<apt-proxy-v1tov2> [v1_conf [v2_sample_conf]] E<gt> v2_conf"
+#: doc/apt-proxy.conf.5:9
+msgid ""
+"B<apt-proxy\\&.conf> is the configuration file for apt-proxy.  When "
+"apt-proxy starts up, it will read I</etc/apt-proxy/apt-proxy\\&.conf>\\&."
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-v1tov2.8:11
+#: doc/apt-proxy.conf.5:12
 msgid ""
-"apt-proxy-v1tov2 tries to update I<v2_sample_conf> with the configuration "
-"found in I<v1_conf> and writes the result to I<stdout>."
+"I</etc/apt-proxy/apt-proxy-v2\\&.conf> will be read instead if it exists to "
+"make upgrading from v1 easier."
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-v1tov2.8:14
+#: doc/apt-proxy.conf.5:15
 msgid ""
-"By default, it will use /etc/apt-proxy/apt-proxy.conf for I<v1_conf> and "
-"/etc/apt-proxy/apt-proxy-v2.conf for I<v2_sample_conf>."
+"The configuration file is divided up into several sections, where each "
+"I<[resource]> section defines a separate resource. The B<DEFAULT> section "
+"applies to all resources."
+msgstr ""
+
+# type: Plain text
+#: doc/apt-proxy.conf.5:19
+msgid ""
+"The supplied I<apt-proxy\\&.conf> will work out of the box, but it is best "
+"to change the backends you use to a mirror closer to you.  There are some in "
+"the default file, and it may be enough just to reorder the lines in the "
+"file\\&."
 msgstr ""
 
 # type: SH
-#: doc/apt-proxy-v1tov2.8:15
+#: doc/apt-proxy.conf.5:21
 #, no-wrap
-msgid "NOTES"
+msgid "[DEFAULT]"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-v1tov2.8:17
-msgid "Hopefully the package maintainer scripts have already run this for you."
+#: doc/apt-proxy.conf.5:23
+msgid "This section holds options global to the whole apt-proxy:"
 msgstr ""
 
-# type: Plain text
-#: doc/apt-proxy-v1tov2.8:20 doc/apt-proxy.conf.5:188
-msgid "/etc/apt-proxy/apt-proxy\\&.conf"
+# type: TP
+#: doc/apt-proxy.conf.5:24
+#, no-wrap
+msgid "B<address>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-v1tov2.8:22 doc/apt-proxy.conf.5:190
-msgid "/etc/apt-proxy/apt-proxy-v2\\&.conf"
+#: doc/apt-proxy.conf.5:28
+msgid ""
+"IP address on which apt-proxy will listen for requests. Multiple addresses "
+"have a empty space between it."
 msgstr ""
 
-# type: Plain text
-#: doc/apt-proxy-v1tov2.8:24
-msgid "Manuel Estrada Sainz E<lt>ranty at debian.orgE<gt>"
+# type: TP
+#: doc/apt-proxy.conf.5:29
+#, no-wrap
+msgid "B<port>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-v1tov2.8:29 doc/apt-proxy-import.8:82
-msgid "B<apt-proxy>(8), B<apt-proxy.conf>(5)"
-msgstr ""
-
-#.  DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-# type: TH
-#: doc/apt-proxy-import.8:2
-#, no-wrap
-msgid "APT-PROXY-IMPORT"
+#: doc/apt-proxy.conf.5:32
+msgid "TCP port on which apt-proxy will listen for requests."
 msgstr ""
 
-#.  DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-# type: TH
-#: doc/apt-proxy-import.8:2
+# type: TP
+#: doc/apt-proxy.conf.5:33
 #, no-wrap
-msgid "March 2006"
+msgid "B<min_refresh_delay>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:5
-msgid "apt-proxy-import - Import packages into the apt-proxy cache."
+#: doc/apt-proxy.conf.5:38
+msgid ""
+"If different from B<off>, means that Packages and other control files will "
+"not be refreshed more frequently than this number of seconds\\&."
 msgstr ""
 
-# type: Plain text
-#: doc/apt-proxy-import.8:8
-msgid "B<apt-proxy-import> [I<options>] I<E<lt>filenameE<gt> >..."
+# type: TP
+#: doc/apt-proxy.conf.5:39 doc/apt-proxy.conf.5:103
+#, no-wrap
+msgid "B<timeout>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:11
+#: doc/apt-proxy.conf.5:44
 msgid ""
-"WARNING: apt-proxy has not been tested under this version of twisted "
-"(2.2.0).  WARNING: although it should work without problem."
+"Maximum I/O timeout in seconds for backend transfers. Default: 30 seconds.  "
+"If no response is received from a backend server in this time, apt-proxy "
+"will try the next server in the list.  Y"
 msgstr ""
 
-# type: Plain text
-#: doc/apt-proxy-import.8:13
-msgid "apt-proxy-import B<-r> [options] E<lt>directoryE<gt> ..."
+# type: TP
+#: doc/apt-proxy.conf.5:45
+#, no-wrap
+msgid "B<cache_dir>"
 msgstr ""
 
-# type: SH
-#: doc/apt-proxy-import.8:13
-#, no-wrap
-msgid "OPTIONS"
+# type: Plain text
+#: doc/apt-proxy.conf.5:48
+msgid "Cache directory.  Default: /var/cache/apt-proxy"
 msgstr ""
 
 # type: TP
-#: doc/apt-proxy-import.8:14
+#: doc/apt-proxy.conf.5:49
 #, no-wrap
-msgid "B<-V>, B<--version>"
+msgid "B<cleanup_freq>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:17
-msgid "print version and quit"
+#: doc/apt-proxy.conf.5:54
+msgid ""
+"If different from B<off>, indicates the time between housekeeping attempts: "
+"delete files that have not been accessed in max_age, scan cache directories "
+"and update internal tables, ..."
 msgstr ""
 
 # type: TP
-#: doc/apt-proxy-import.8:17
+#: doc/apt-proxy.conf.5:55
 #, no-wrap
-msgid "B<-v>, B<--verbose>"
+msgid "B<max_age>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:20
-msgid "give verbose output"
+#: doc/apt-proxy.conf.5:59
+msgid ""
+"If different from B<off>, indicates the maximum age of files before deletion "
+"from the cache."
 msgstr ""
 
 # type: TP
-#: doc/apt-proxy-import.8:20
+#: doc/apt-proxy.conf.5:60
 #, no-wrap
-msgid "B<-d>, B<--debug>"
+msgid "B<max_versions>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:23
-msgid "debug output"
+#: doc/apt-proxy.conf.5:67
+msgid ""
+"If different from B<off>, indicates the maximum number of versions of a "
+"\\&.deb to keep.  This is the number of versions per distribution, for "
+"example setting max_versions to 2 will ensure that a maximum of 6 packages "
+"would be kept: the last 2 stable versions, the last 2 testing versions and "
+"the last 2 unstable versions."
 msgstr ""
 
 # type: TP
-#: doc/apt-proxy-import.8:23
+#: doc/apt-proxy.conf.5:68 doc/apt-proxy.conf.5:118
 #, no-wrap
-msgid "B<-q>, B<--quiet>"
+msgid "B<passive_ftp>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:26
-msgid "try not to write messages to stdout"
+#: doc/apt-proxy.conf.5:73
+msgid ""
+"Specify B<on> to use passive FTP, which works from behind a firewall, but "
+"may not be supported on all servers.  Specify B<off> to use active FTP "
+"instead.  Default: on"
 msgstr ""
 
 # type: TP
-#: doc/apt-proxy-import.8:26
+#: doc/apt-proxy.conf.5:74 doc/apt-proxy.conf.5:127
 #, no-wrap
-msgid "B<-r>, B<--recursive>"
+msgid "B<http_proxy>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:29
-msgid "recurse into subdirectories"
+#: doc/apt-proxy.conf.5:78
+msgid ""
+"Specify B<[username:password@]hostname:port> to use an upstream proxy.  "
+"Username and password are optional."
 msgstr ""
 
-# type: Plain text
-#: doc/apt-proxy-import.8:32
-msgid "Display this help and exit."
+# type: TP
+#: doc/apt-proxy.conf.5:79
+#, no-wrap
+msgid "B<dynamic_backends>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:35
-msgid "Configuration file"
+#: doc/apt-proxy.conf.5:84
+msgid ""
+"By default apt-proxy will add HTTP backends dynamically if not already "
+"defined. Specify B<off> to restrict the available backends to those listed "
+"in the configuration file.  Default: on"
 msgstr ""
 
-# type: Plain text
-#: doc/apt-proxy-import.8:37
-msgid "apt-proxy-import imports .deb files into the apt-proxy cache."
+# type: TP
+#: doc/apt-proxy.conf.5:85
+#, no-wrap
+msgid "B<disable_pipelining>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:41
+#: doc/apt-proxy.conf.5:91
 msgid ""
-"It uses the package lists to determine where each file should be placed, so "
-"you should run B<'apt-get update'> to allow apt-proxy to update the package "
-"lists before running apt-proxy-import."
+"apt-proxy can use HTTP pipelining to fetch several files at once (up to 10), "
+"but this can generate multiple connections to each backend server.  "
+"Pipelining is disabled by default until this is fixed.  Set to B<0> to "
+"enable experimental http pipelining.  Default: 1"
+msgstr ""
+
+# type: TP
+#: doc/apt-proxy.conf.5:92
+#, no-wrap
+msgid "B<bandwidth_limit = >I<amount>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:44
-msgid "WARNING: although it should work without problem.  apt-proxy-import 1.9.x"
+#: doc/apt-proxy.conf.5:97
+msgid ""
+"When downloading from a backend server, limit the download speed to "
+"I<amount> bytes per second. Note this applies to B<http> and B<rsync> "
+"backends only. Default: no limit"
 msgstr ""
 
 # type: SH
-#: doc/apt-proxy-import.8:44
+#: doc/apt-proxy.conf.5:99
 #, no-wrap
-msgid "USING TO BOOTSTRAP A NEW APT-PROXY CACHE"
+msgid "RESOURCES"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:48
+#: doc/apt-proxy.conf.5:102
 msgid ""
-"If you have been using apt standalone, you probably have built up a large "
-"collection of .debs or .udebs in apt's cache directory.  You can import "
-"these files into apt-proxy as follows:"
+"All other sections in the configuration file will be interpreted as resource "
+"names.  The options in the section apply to this resource only."
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:50
-msgid "1. Update apt-proxy's filelists:"
+#: doc/apt-proxy.conf.5:106
+msgid "Overrides the global timeout"
 msgstr ""
 
-# type: Plain text
-#: doc/apt-proxy-import.8:52
+# type: TP
+#: doc/apt-proxy.conf.5:107
 #, no-wrap
-msgid "    apt-get update\n"
+msgid ""
+"B<backends = "
+">I<E<lt>protocolE<gt>>B<://>I<E<lt>serverE<gt>>B</>I<E<lt>directoryE<gt>>B< "
+"[...]>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:55
-msgid "2. Import files from apt's cache:"
+#: doc/apt-proxy.conf.5:110
+msgid "A list one or more URLs referring to servers which hold debian packages\\&."
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:57
-#, no-wrap
-msgid "    apt-proxy-import -i /var/cache/apt/archives\n"
+#: doc/apt-proxy.conf.5:113
+msgid "I<protocol>: internet protocol to use: http, ftp or rsync"
 msgstr ""
 
-# type: SH
-#: doc/apt-proxy-import.8:58
-#, no-wrap
-msgid "IMPORTING APT-MOVE CACHE"
+# type: Plain text
+#: doc/apt-proxy.conf.5:115
+msgid "I<server>: hostname of the backend server to contact"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:60
-msgid ""
-"You can import the apt-move generated cache into apt-proxy using the "
-"following command:"
+#: doc/apt-proxy.conf.5:117
+msgid "I<directory>: directory name to prepend requests to for this server"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:63
+#: doc/apt-proxy.conf.5:121
+msgid "Override the global setting of passive_ftp"
+msgstr ""
+
+# type: TP
+#: doc/apt-proxy.conf.5:122
 #, no-wrap
-msgid "    apt-proxy-import -r -i /var/cache/apt-move\n"
+msgid "B<bandwidth_limit>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:66
+#: doc/apt-proxy.conf.5:126
 msgid ""
-"This tells apt-proxy-import to recuse over each directory in the apt-move "
-"cache."
+"Set a bandwidth limit for downloads for this resource, overriding the global "
+"bandwidth_limit"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:68
-msgid "\\ /etc/apt-proxy/apt-proxy\\&.conf"
+#: doc/apt-proxy.conf.5:131
+msgid ""
+"Specify B<[username:password@]hostname:port> to use an upstream proxy, "
+"overriding the global http_proxy."
+msgstr ""
+
+# type: SH
+#: doc/apt-proxy.conf.5:132
+#, no-wrap
+msgid "CONFIGURATION EXAMPLES"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:71
+#: doc/apt-proxy.conf.5:137
 msgid ""
-"apt-proxy-import does not use I<max_age> or I<max_versions> to clean the "
-"cache directory on import."
+"To access a resource that's listed under a specific section name, simply "
+"append the section name (without the brackets) to the end of your deb source "
+"line in /etc/apt/sources.list"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:73
-msgid "It does not yet import source.tar.gz or Packages files."
+#: doc/apt-proxy.conf.5:139
+msgid "B<Debian main>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:75
-msgid "You must run it as the apt-proxy user or as root."
+#: doc/apt-proxy.conf.5:142
+msgid "This example shows how to give clients access to the main Debian archive:"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:77
+#: doc/apt-proxy.conf.5:146
+#, no-wrap
 msgid ""
-"Chris Halls E<lt>halls at debian.orgE<gt>, Manuel Estrada Sainz "
-"E<lt>ranty at debian.orgE<gt>"
+"[debian]\n"
+"backends = http://ftp.us.debian.org/debian/\n"
+"           http://ftp.de.debian.org/debian/\n"
 msgstr ""
 
-#.  Man page copied from apt.conf man page.
-# type: TH
-#: doc/apt-proxy.conf.5:2
-#, no-wrap
-msgid "apt-proxy\\&.conf"
+# type: Plain text
+#: doc/apt-proxy.conf.5:151
+msgid "Using this configuration, the client would use a I<sources.list> entry like:"
 msgstr ""
 
-#.  Man page copied from apt.conf man page.
-# type: TH
-#: doc/apt-proxy.conf.5:2
+# type: Plain text
+#: doc/apt-proxy.conf.5:154
 #, no-wrap
-msgid "5 Jan 2006"
+msgid "    deb http://server:9999/debian woody main\n"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:5
-msgid "apt-proxy\\&.conf - configuration file for apt-proxy"
+#: doc/apt-proxy.conf.5:159
+msgid ""
+"And so the file request `/debian/woody/main/binary-i386/x11/foo_1-1.deb' "
+"would turn into a backend request of first"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:9
+#: doc/apt-proxy.conf.5:162
+#, no-wrap
 msgid ""
-"B<apt-proxy\\&.conf> is the configuration file for apt-proxy.  When "
-"apt-proxy starts up, it will read I</etc/apt-proxy/apt-proxy\\&.conf>\\&."
+"    "
+"`http://ftp.us.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb'\n"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:12
-msgid ""
-"I</etc/apt-proxy/apt-proxy-v2\\&.conf> will be read instead if it exists to "
-"make upgrading from v1 easier."
+#: doc/apt-proxy.conf.5:165
+msgid "and if that failed,"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:15
+#: doc/apt-proxy.conf.5:168
+#, no-wrap
 msgid ""
-"The configuration file is divided up into several sections, where each "
-"I<[resource]> section defines a separate resource. The B<DEFAULT> section "
-"applies to all resources."
+"    "
+"`http://ftp.de.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb'\n"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:19
-msgid ""
-"The supplied I<apt-proxy\\&.conf> will work out of the box, but it is best "
-"to change the backends you use to a mirror closer to you.  There are some in "
-"the default file, and it may be enough just to reorder the lines in the "
-"file\\&."
+#: doc/apt-proxy.conf.5:171
+msgid "and apt-proxy will place the downloaded package in"
 msgstr ""
 
-# type: SH
-#: doc/apt-proxy.conf.5:21
+# type: Plain text
+#: doc/apt-proxy.conf.5:173
 #, no-wrap
-msgid "[DEFAULT]"
+msgid ""
+"    "
+"`/var/cache/apt-proxy/debian/debian/woody/main/binary-i386/x11/foo_1-1.deb'\\&.\n"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:23
-msgid "This section holds options global to the whole apt-proxy:"
+#: doc/apt-proxy.conf.5:176
+msgid "B<backports.org>"
 msgstr ""
 
-# type: TP
-#: doc/apt-proxy.conf.5:24
+# type: Plain text
+#: doc/apt-proxy.conf.5:178
+msgid "The backports.org website tells you to use this I<sources.list> line:"
+msgstr ""
+
+# type: Plain text
+#: doc/apt-proxy.conf.5:181
 #, no-wrap
-msgid "B<address>"
+msgid "    deb http://www.backports.org/debian sarge-backports main\n"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:28
+#: doc/apt-proxy.conf.5:185
 msgid ""
-"IP address on which apt-proxy will listen for requests. Multiple addresses "
-"have a empty space between it."
+"You can add this to apt-proxy by creating a new section in "
+"I<apt-proxy\\&.conf>\\&.  In the new section, add a backends entry for the "
+"URL:"
 msgstr ""
 
-# type: TP
-#: doc/apt-proxy.conf.5:29
+# type: Plain text
+#: doc/apt-proxy.conf.5:189
 #, no-wrap
-msgid "B<port>"
+msgid ""
+"    [backports]\n"
+"    backends = http://www.backports.org/debian\n"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:32
-msgid "TCP port on which apt-proxy will listen for requests."
+#: doc/apt-proxy.conf.5:194
+msgid ""
+"On the clients, replace the URL with one pointing to the apt-proxy resource "
+"name, in the form I<http://hostname:port/backend>. If your apt-proxy "
+"hostname is I<proxy> and it is running on port 9999, you would write:"
 msgstr ""
 
-# type: TP
-#: doc/apt-proxy.conf.5:33
+# type: Plain text
+#: doc/apt-proxy.conf.5:197
 #, no-wrap
-msgid "B<min_refresh_delay>"
+msgid "   deb http://proxy:9999/backports sarge-backports main\n"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:38
+#: doc/apt-proxy.conf.5:202
 msgid ""
-"If different from B<off>, means that Packages and other control files will "
-"not be refreshed more frequently than this number of seconds\\&."
+"For many more examples, see the supplied "
+"/etc/apt-proxy/apt-proxy\\&.conf\\&."
 msgstr ""
 
-# type: TP
-#: doc/apt-proxy.conf.5:39 doc/apt-proxy.conf.5:96
-#, no-wrap
-msgid "B<timeout>"
+# type: Plain text
+#: doc/apt-proxy.conf.5:205 doc/apt-proxy-v1tov2.8:20
+msgid "/etc/apt-proxy/apt-proxy\\&.conf"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:44
-msgid ""
-"Maximum I/O timeout in seconds for backend transfers. Default: 30 seconds.  "
-"If no response is received from a backend server in this time, apt-proxy "
-"will try the next server in the list.  Y"
+#: doc/apt-proxy.conf.5:207 doc/apt-proxy-v1tov2.8:22
+msgid "/etc/apt-proxy/apt-proxy-v2\\&.conf"
 msgstr ""
 
-# type: TP
-#: doc/apt-proxy.conf.5:45
-#, no-wrap
-msgid "B<cache_dir>"
+# type: Plain text
+#: doc/apt-proxy.conf.5:213
+msgid "B<apt-proxy(8),> B</usr/share/doc/apt-proxy/README,> B<apt-proxy-import(8)>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:48
-msgid "Cache directory.  Default: /var/cache/apt-proxy"
+#: doc/apt-proxy.conf.5:218
+msgid "Plenty sure.  Please report."
 msgstr ""
 
-# type: TP
-#: doc/apt-proxy.conf.5:49
+# type: SH
+#: doc/apt-proxy.conf.5:219
 #, no-wrap
-msgid "B<cleanup_freq>"
+msgid "AUTHOR"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:54
+#: doc/apt-proxy.conf.5:220
 msgid ""
-"If different from B<off>, indicates the time between housekeeping attempts: "
-"delete files that have not been accessed in max_age, scan cache directories "
-"and update internal tables, ..."
+"apt-proxy v2 was written by Manuel Estrada Sainz "
+"E<lt>ranty at debian.orgE<gt>\\&."
 msgstr ""
 
-# type: TP
-#: doc/apt-proxy.conf.5:55
+# type: TH
+#: doc/apt-proxy-import.8:2
 #, no-wrap
-msgid "B<max_age>"
+msgid "APT-PROXY-IMPORT"
 msgstr ""
 
-# type: Plain text
-#: doc/apt-proxy.conf.5:59
-msgid ""
-"If different from B<off>, indicates the maximum age of files before deletion "
-"from the cache."
+# type: TH
+#: doc/apt-proxy-import.8:2
+#, no-wrap
+msgid "August 2006"
 msgstr ""
 
-# type: TP
-#: doc/apt-proxy.conf.5:60
+# type: TH
+#: doc/apt-proxy-import.8:2 doc/apt-proxy-v1tov2.8:1
 #, no-wrap
-msgid "B<max_versions>"
+msgid "Debian GNU/Linux"
+msgstr ""
+
+# type: TH
+#: doc/apt-proxy-import.8:2 doc/apt-proxy-v1tov2.8:1
+#, no-wrap
+msgid " "
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:67
-msgid ""
-"If different from B<off>, indicates the maximum number of versions of a "
-"\\&.deb to keep.  This is the number of versions per distribution, for "
-"example setting max_versions to 2 will ensure that a maximum of 6 packages "
-"would be kept: the last 2 stable versions, the last 2 testing versions and "
-"the last 2 unstable versions."
+#: doc/apt-proxy-import.8:5
+msgid "apt-proxy-import - Import packages into the apt-proxy cache."
 msgstr ""
 
-# type: TP
-#: doc/apt-proxy.conf.5:68 doc/apt-proxy.conf.5:111
-#, no-wrap
-msgid "B<passive_ftp>"
+# type: Plain text
+#: doc/apt-proxy-import.8:8
+msgid "B<apt-proxy-import> [I<options>] I<E<lt>filenameE<gt> >..."
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:73
-msgid ""
-"Specify B<on> to use passive FTP, which works from behind a firewall, but "
-"may not be supported on all servers.  Specify B<off> to use active FTP "
-"instead.  Default: on"
+#: doc/apt-proxy-import.8:11
+msgid "apt-proxy-import B<-r> [options] E<lt>directoryE<gt> ..."
+msgstr ""
+
+# type: SH
+#: doc/apt-proxy-import.8:11
+#, no-wrap
+msgid "OPTIONS"
 msgstr ""
 
 # type: TP
-#: doc/apt-proxy.conf.5:74
+#: doc/apt-proxy-import.8:12
 #, no-wrap
-msgid "B<http_proxy>"
+msgid "B<-V>, B<--version>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:77
-msgid "Specify B<hostname:port> to use an upstream proxy."
+#: doc/apt-proxy-import.8:15
+msgid "print version and quit"
 msgstr ""
 
 # type: TP
-#: doc/apt-proxy.conf.5:78
+#: doc/apt-proxy-import.8:15
 #, no-wrap
-msgid "B<dynamic_backends>"
+msgid "B<-v>, B<--verbose>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:83
-msgid ""
-"By default apt-proxy will add HTTP backends dynamically if not already "
-"defined. Specify B<off> to restrict the available backends to those listed "
-"in the configuration file.  Default: on"
+#: doc/apt-proxy-import.8:18
+msgid "give verbose output"
 msgstr ""
 
 # type: TP
-#: doc/apt-proxy.conf.5:84
+#: doc/apt-proxy-import.8:18
 #, no-wrap
-msgid "B<disable_pipelining>"
+msgid "B<-d>, B<--debug>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:90
-msgid ""
-"apt-proxy can use HTTP pipelining to fetch several files at once (up to 10), "
-"but this can generate multiple connections to each backend server.  "
-"Pipelining is disabled by default until this is fixed.  Set to B<0> to "
-"enable experimental http pipelining.  Default: 1"
+#: doc/apt-proxy-import.8:21
+msgid "debug output"
 msgstr ""
 
-# type: SH
-#: doc/apt-proxy.conf.5:92
+# type: TP
+#: doc/apt-proxy-import.8:21
 #, no-wrap
-msgid "RESOURCES"
-msgstr ""
-
-# type: Plain text
-#: doc/apt-proxy.conf.5:95
-msgid ""
-"All other sections in the configuration file will be interpreted as resource "
-"names.  The options in the section apply to this resource only."
+msgid "B<-q>, B<--quiet>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:99
-msgid "Overrides the global timeout"
+#: doc/apt-proxy-import.8:24
+msgid "try not to write messages to stdout"
 msgstr ""
 
 # type: TP
-#: doc/apt-proxy.conf.5:100
+#: doc/apt-proxy-import.8:24
 #, no-wrap
-msgid ""
-"B<backends = "
-">I<E<lt>protocolE<gt>>B<://>I<E<lt>serverE<gt>>B</>I<E<lt>directoryE<gt>>B< "
-"[...]>"
+msgid "B<-r>, B<--recursive>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:103
-msgid "A list one or more URLs referring to servers which hold debian packages\\&."
+#: doc/apt-proxy-import.8:27
+msgid "recurse into subdirectories"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:106
-msgid "I<protocol>: internet protocol to use: http, ftp or rsync"
+#: doc/apt-proxy-import.8:30
+msgid "Display this help and exit."
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:108
-msgid "I<server>: hostname of the backend server to contact"
+#: doc/apt-proxy-import.8:33
+msgid "Configuration file"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:110
-msgid "I<directory>: directory name to prepend requests to for this server"
+#: doc/apt-proxy-import.8:35
+msgid "apt-proxy-import imports .deb files into the apt-proxy cache."
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:114
-msgid "Override the global setting of passive_ftp"
+#: doc/apt-proxy-import.8:39
+msgid ""
+"It uses the package lists to determine where each file should be placed, so "
+"you should run B<'apt-get update'> to allow apt-proxy to update the package "
+"lists before running apt-proxy-import."
 msgstr ""
 
 # type: SH
-#: doc/apt-proxy.conf.5:115
+#: doc/apt-proxy-import.8:39
 #, no-wrap
-msgid "CONFIGURATION EXAMPLES"
+msgid "USING TO BOOTSTRAP A NEW APT-PROXY CACHE"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:120
+#: doc/apt-proxy-import.8:43
 msgid ""
-"To access a resource that's listed under a specific section name, simply "
-"append the section name (without the brackets) to the end of your deb source "
-"line in /etc/apt/sources.list"
-msgstr ""
-
-# type: Plain text
-#: doc/apt-proxy.conf.5:122
-msgid "B<Debian main>"
+"If you have been using apt standalone, you probably have built up a large "
+"collection of .debs or .udebs in apt's cache directory.  You can import "
+"these files into apt-proxy as follows:"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:125
-msgid "This example shows how to give clients access to the main Debian archive:"
+#: doc/apt-proxy-import.8:45
+msgid "1. Update apt-proxy's filelists:"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:129
+#: doc/apt-proxy-import.8:47
 #, no-wrap
-msgid ""
-"[debian]\n"
-"backends = http://ftp.us.debian.org/debian/\n"
-"           http://ftp.de.debian.org/debian/\n"
+msgid "    apt-get update\n"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:134
-msgid "Using this configuration, the client would use a I<sources.list> entry like:"
+#: doc/apt-proxy-import.8:50
+msgid "2. Import files from apt's cache:"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:137
+#: doc/apt-proxy-import.8:52
 #, no-wrap
-msgid "    deb http://server:9999/debian woody main\n"
+msgid "    apt-proxy-import /var/cache/apt/archives\n"
 msgstr ""
 
-# type: Plain text
-#: doc/apt-proxy.conf.5:142
-msgid ""
-"And so the file request `/debian/woody/main/binary-i386/x11/foo_1-1.deb' "
-"would turn into a backend request of first"
+# type: SH
+#: doc/apt-proxy-import.8:53
+#, no-wrap
+msgid "IMPORTING APT-MOVE CACHE"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:145
-#, no-wrap
+#: doc/apt-proxy-import.8:55
 msgid ""
-"    "
-"`http://ftp.us.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb'\n"
+"You can import the apt-move generated cache into apt-proxy using the "
+"following command:"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:148
-msgid "and if that failed,"
+#: doc/apt-proxy-import.8:58
+#, no-wrap
+msgid "    apt-proxy-import -r /var/cache/apt-move\n"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:151
-#, no-wrap
+#: doc/apt-proxy-import.8:61
 msgid ""
-"    "
-"`http://ftp.de.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb'\n"
+"This tells apt-proxy-import to recuse over each directory in the apt-move "
+"cache."
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:154
-msgid "and apt-proxy will place the downloaded package in"
+#: doc/apt-proxy-import.8:63
+msgid "\\ /etc/apt-proxy/apt-proxy\\&.conf"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:156
-#, no-wrap
+#: doc/apt-proxy-import.8:66
 msgid ""
-"    "
-"`/var/cache/apt-proxy/debian/debian/woody/main/binary-i386/x11/foo_1-1.deb'\\&.\n"
+"apt-proxy-import does not use I<max_age> or I<max_versions> to clean the "
+"cache directory on import."
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:159
-msgid "B<backports.org>"
+#: doc/apt-proxy-import.8:68
+msgid "It does not yet import source.tar.gz or Packages files."
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:161
-msgid "The backports.org website tells you to use this I<sources.list> line:"
+#: doc/apt-proxy-import.8:70
+msgid "You must run it as the apt-proxy user or as root."
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:164
-#, no-wrap
-msgid "    deb http://www.backports.org/debian sarge-backports main\n"
+#: doc/apt-proxy-import.8:72
+msgid ""
+"Chris Halls E<lt>halls at debian.orgE<gt>, Manuel Estrada Sainz "
+"E<lt>ranty at debian.orgE<gt>"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:168
-msgid ""
-"You can add this to apt-proxy by creating a new section in "
-"I<apt-proxy\\&.conf>\\&.  In the new section, add a backends entry for the "
-"URL:"
+#: doc/apt-proxy-import.8:77 doc/apt-proxy-v1tov2.8:29
+msgid "B<apt-proxy>(8), B<apt-proxy.conf>(5)"
 msgstr ""
 
-# type: Plain text
-#: doc/apt-proxy.conf.5:172
+# type: TH
+#: doc/apt-proxy-v1tov2.8:1
 #, no-wrap
-msgid ""
-"    [backports]\n"
-"    backends = http://www.backports.org/debian\n"
+msgid "APT-PROXY-V1TOV2"
 msgstr ""
 
-# type: Plain text
-#: doc/apt-proxy.conf.5:177
-msgid ""
-"On the clients, replace the URL with one pointing to the apt-proxy resource "
-"name, in the form I<http://hostname:port/backend>. If your apt-proxy "
-"hostname is I<proxy> and it is running on port 9999, you would write:"
+# type: TH
+#: doc/apt-proxy-v1tov2.8:1
+#, no-wrap
+msgid "November 2002"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:180
-#, no-wrap
-msgid "   deb http://proxy:9999/backports sarge-backports main\n"
+#: doc/apt-proxy-v1tov2.8:4
+msgid "apt-proxy-v1tov2 - Updates apt-proxy configuration to the new format."
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:185
-msgid ""
-"For many more examples, see the supplied "
-"/etc/apt-proxy/apt-proxy\\&.conf\\&."
+#: doc/apt-proxy-v1tov2.8:7
+msgid "B<apt-proxy-v1tov2> [v1_conf [v2_sample_conf]] E<gt> v2_conf"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:196
-msgid "B<apt-proxy(8),> B</usr/share/doc/apt-proxy/README,> B<apt-proxy-import(8)>"
+#: doc/apt-proxy-v1tov2.8:11
+msgid ""
+"apt-proxy-v1tov2 tries to update I<v2_sample_conf> with the configuration "
+"found in I<v1_conf> and writes the result to I<stdout>."
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:201
-msgid "Plenty sure.  Please report."
+#: doc/apt-proxy-v1tov2.8:14
+msgid ""
+"By default, it will use /etc/apt-proxy/apt-proxy.conf for I<v1_conf> and "
+"/etc/apt-proxy/apt-proxy-v2.conf for I<v2_sample_conf>."
 msgstr ""
 
 # type: SH
-#: doc/apt-proxy.conf.5:202
+#: doc/apt-proxy-v1tov2.8:15
 #, no-wrap
-msgid "AUTHOR"
+msgid "NOTES"
 msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:203
-msgid ""
-"apt-proxy v2 was written by Manuel Estrada Sainz "
-"E<lt>ranty at debian.orgE<gt>\\&."
+#: doc/apt-proxy-v1tov2.8:17
+msgid "Hopefully the package maintainer scripts have already run this for you."
+msgstr ""
+
+# type: Plain text
+#: doc/apt-proxy-v1tov2.8:24
+msgid "Manuel Estrada Sainz E<lt>ranty at debian.orgE<gt>"
 msgstr ""

Modified: trunk/doc/po/fr.po
==============================================================================
--- trunk/doc/po/fr.po	(original)
+++ trunk/doc/po/fr.po	Mon Aug 14 12:48:00 2006
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: apt-proxy 1.3.6.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-29  0:11+0200\n"
+"POT-Creation-Date: 2006-08-14 12:59+0100\n"
 "PO-Revision-Date: 2005-10-18 19:14+0200\n"
 "Last-Translator: Sylvain Archenault <sylvain.archenault at laposte.net>\n"
 "Language-Team: French <French <debian-l10n-french at lists.debian.org>>\n"
@@ -18,14 +18,12 @@
 "X-Generator: KBabel 1.10.2\n"
 
 # type: TH
-#.  Man page copied from apt.conf man page.
 #: doc/apt-proxy.8:2 doc/apt-proxy.conf.5:2
 #, no-wrap
 msgid "apt-proxy"
 msgstr "apt-proxy"
 
 # type: TH
-#.  Man page copied from apt.conf man page.
 #: doc/apt-proxy.8:2
 #, no-wrap
 msgid "15 Jul 2005"
@@ -45,7 +43,7 @@
 "serveurs Debian"
 
 # type: SH
-#: doc/apt-proxy.8:5 doc/apt-proxy-v1tov2.8:4 doc/apt-proxy-import.8:5
+#: doc/apt-proxy.8:5 doc/apt-proxy-import.8:5 doc/apt-proxy-v1tov2.8:4
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr "SYNOPSIS"
@@ -56,8 +54,8 @@
 msgstr "B<apt-proxy> I<[options] [fichier de journal]>"
 
 # type: SH
-#: doc/apt-proxy.8:10 doc/apt-proxy-v1tov2.8:8 doc/apt-proxy-import.8:8
-#: doc/apt-proxy.conf.5:6
+#: doc/apt-proxy.8:10 doc/apt-proxy.conf.5:6 doc/apt-proxy-import.8:8
+#: doc/apt-proxy-v1tov2.8:8
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
@@ -77,7 +75,7 @@
 "proxy écoute par défaut sur le port 9999."
 
 # type: TP
-#: doc/apt-proxy.8:16 doc/apt-proxy-import.8:29
+#: doc/apt-proxy.8:16 doc/apt-proxy-import.8:27
 #, no-wrap
 msgid "B<-h>, B<--help>"
 msgstr "B<-h>, B<--help>"
@@ -88,7 +86,7 @@
 msgstr "Affiche les informations d'utilisation"
 
 # type: TP
-#: doc/apt-proxy.8:19 doc/apt-proxy-import.8:32
+#: doc/apt-proxy.8:19 doc/apt-proxy-import.8:30
 #, no-wrap
 msgid "B<-c>, B<--config-file=>"
 msgstr "B<-c>, B<--config-file=>"
@@ -196,8 +194,8 @@
 "au mandataire (« proxy »)."
 
 # type: SH
-#: doc/apt-proxy.8:56 doc/apt-proxy-v1tov2.8:18 doc/apt-proxy-import.8:66
-#: doc/apt-proxy.conf.5:186
+#: doc/apt-proxy.8:56 doc/apt-proxy.conf.5:203 doc/apt-proxy-import.8:61
+#: doc/apt-proxy-v1tov2.8:18
 #, no-wrap
 msgid "FILES"
 msgstr "FICHIERS"
@@ -208,8 +206,8 @@
 msgstr "/etc/apt-proxy/apt-proxy.conf ou /etc/apt-proxy/apt-proxy-v2.conf"
 
 # type: SH
-#: doc/apt-proxy.8:61 doc/apt-proxy-v1tov2.8:24 doc/apt-proxy-import.8:77
-#: doc/apt-proxy.conf.5:190
+#: doc/apt-proxy.8:61 doc/apt-proxy.conf.5:207 doc/apt-proxy-import.8:72
+#: doc/apt-proxy-v1tov2.8:24
 #, no-wrap
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
@@ -220,7 +218,7 @@
 msgstr "B<apt-proxy.conf>(5), B<apt-proxy-import>(8)"
 
 # type: SH
-#: doc/apt-proxy.8:68 doc/apt-proxy-import.8:68 doc/apt-proxy.conf.5:199
+#: doc/apt-proxy.8:68 doc/apt-proxy.conf.5:216 doc/apt-proxy-import.8:63
 #, no-wrap
 msgid "BUGS"
 msgstr "ANOMALIES"
@@ -237,7 +235,7 @@
 "beaucoup plus pour les paquets sources et autres."
 
 # type: SH
-#: doc/apt-proxy.8:73 doc/apt-proxy-v1tov2.8:22 doc/apt-proxy-import.8:75
+#: doc/apt-proxy.8:73 doc/apt-proxy-import.8:70 doc/apt-proxy-v1tov2.8:22
 #, no-wrap
 msgid "AUTHORS"
 msgstr "AUTEURS"
@@ -252,821 +250,840 @@
 "Halls."
 
 # type: TH
-#: doc/apt-proxy-v1tov2.8:1
-#, no-wrap
-msgid "APT-PROXY-V1TOV2"
-msgstr "APT-PROXY-V1TOV2"
-
-# type: TH
-#: doc/apt-proxy-v1tov2.8:1
-#, no-wrap
-msgid "November 2002"
-msgstr "novembre 2002"
-
-# type: TH
-#.  DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-#: doc/apt-proxy-v1tov2.8:1 doc/apt-proxy-import.8:2
+#: doc/apt-proxy.conf.5:2
 #, no-wrap
-msgid "Debian GNU/Linux"
-msgstr "Debian GNU/Linux"
+msgid "apt-proxy\\&.conf"
+msgstr "apt-proxy.conf"
 
 # type: TH
-#.  DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-#: doc/apt-proxy-v1tov2.8:1 doc/apt-proxy-import.8:2
+#: doc/apt-proxy.conf.5:2
 #, fuzzy, no-wrap
-msgid "  "
-msgstr " "
+msgid "5 Jan 2006"
+msgstr "15 jul 2005"
 
 # type: SH
-#: doc/apt-proxy-v1tov2.8:2 doc/apt-proxy-import.8:3 doc/apt-proxy.conf.5:3
+#: doc/apt-proxy.conf.5:3 doc/apt-proxy-import.8:3 doc/apt-proxy-v1tov2.8:2
 #, no-wrap
 msgid "NAME"
 msgstr "NOM"
 
 # type: Plain text
-#: doc/apt-proxy-v1tov2.8:4
-msgid "apt-proxy-v1tov2 - Updates apt-proxy configuration to the new format."
+#: doc/apt-proxy.conf.5:5
+msgid "apt-proxy\\&.conf - configuration file for apt-proxy"
+msgstr "apt-proxy.conf - fichier de configuration pour apt-proxy"
+
+# type: Plain text
+#: doc/apt-proxy.conf.5:9
+#, fuzzy
+msgid ""
+"B<apt-proxy\\&.conf> is the configuration file for apt-proxy.  When apt-"
+"proxy starts up, it will read I</etc/apt-proxy/apt-proxy\\&.conf>\\&."
 msgstr ""
-"apt-proxy-v1tov2 - Convertit la configuration d'apt-proxy vers le nouveau "
-"format."
+"B<apt-proxy.conf> est le fichier de configuration pour apt-proxy. Au "
+"démarrage d'apt-proxy, il lira le fichier B</etc/apt-proxy/apt-proxy.conf>."
 
 # type: Plain text
-#: doc/apt-proxy-v1tov2.8:7
-msgid "B<apt-proxy-v1tov2> [v1_conf [v2_sample_conf]] E<gt> v2_conf"
-msgstr "B<apt-proxy-v1tov2> [v1_conf [v2_exemple_conf]] E<gt> v2_conf"
+#: doc/apt-proxy.conf.5:12
+#, fuzzy
+msgid ""
+"I</etc/apt-proxy/apt-proxy-v2\\&.conf> will be read instead if it exists to "
+"make upgrading from v1 easier."
+msgstr ""
+"B</etc/apt-proxy/apt-proxy-v2.conf> sera lu à la place s'il existe afin de "
+"rendre la mise à jour depuis la version 1 plus transparente."
 
 # type: Plain text
-#: doc/apt-proxy-v1tov2.8:11
+#: doc/apt-proxy.conf.5:15
 msgid ""
-"apt-proxy-v1tov2 tries to update I<v2_sample_conf> with the configuration "
-"found in I<v1_conf> and writes the result to I<stdout>."
+"The configuration file is divided up into several sections, where each I<"
+"[resource]> section defines a separate resource. The B<DEFAULT> section "
+"applies to all resources."
 msgstr ""
-"apt-proxy-v1tov2 tente de convertir I<v2_exemple_conf> avec la configuration "
-"trouvée dans le fichier I<v1_conf> et écrira le résultat sur I<stdout>."
 
 # type: Plain text
-#: doc/apt-proxy-v1tov2.8:14
+#: doc/apt-proxy.conf.5:19
+#, fuzzy
 msgid ""
-"By default, it will use /etc/apt-proxy/apt-proxy.conf for I<v1_conf> and /"
-"etc/apt-proxy/apt-proxy-v2.conf for I<v2_sample_conf>."
+"The supplied I<apt-proxy\\&.conf> will work out of the box, but it is best "
+"to change the backends you use to a mirror closer to you.  There are some in "
+"the default file, and it may be enough just to reorder the lines in the file"
+"\\&."
 msgstr ""
-"Par défaut, il utilisera /etc/apt-proxy/apt-proxy.conf pour I<v1_conf> et /"
-"etc/apt-proxy/apt-proxy-v2.conf pour I<v2_example_conf>."
+"Le fichier apt-proxy.conf fourni devrait fonctionner tel quel, mais il est "
+"suggéré de choisir un miroir plus proche de vous. Certains sont dans le "
+"fichier apt-proxy.conf par défaut et il devrait suffire de réordonner les "
+"lignes dans ce fichier."
 
 # type: SH
-#: doc/apt-proxy-v1tov2.8:15
+#: doc/apt-proxy.conf.5:21
 #, no-wrap
-msgid "NOTES"
-msgstr "NOTES"
+msgid "[DEFAULT]"
+msgstr "[DÉFAUT]"
 
 # type: Plain text
-#: doc/apt-proxy-v1tov2.8:17
-msgid "Hopefully the package maintainer scripts have already run this for you."
-msgstr ""
-"Vraisemblablement, les scripts du responsable de paquet doivent déjà l'avoir "
-"fait pour vous."
+#: doc/apt-proxy.conf.5:23
+msgid "This section holds options global to the whole apt-proxy:"
+msgstr "Cette section contient les options globales d'apt-proxy :"
 
-# type: Plain text
-#: doc/apt-proxy-v1tov2.8:20 doc/apt-proxy.conf.5:188
-msgid "/etc/apt-proxy/apt-proxy\\&.conf"
-msgstr "/etc/apt-proxy/apt-proxy.conf"
+# type: TP
+#: doc/apt-proxy.conf.5:24
+#, no-wrap
+msgid "B<address>"
+msgstr "B<address>"
 
 # type: Plain text
-#: doc/apt-proxy-v1tov2.8:22 doc/apt-proxy.conf.5:190
-msgid "/etc/apt-proxy/apt-proxy-v2\\&.conf"
-msgstr "/etc/apt-proxy/apt-proxy-v2.conf"
+#: doc/apt-proxy.conf.5:28
+msgid ""
+"IP address on which apt-proxy will listen for requests. Multiple addresses "
+"have a empty space between it."
+msgstr ""
+"L'adresse IP sur laquelle apt-proxy sera à l'écoute des requêtes. S'il y a "
+"plusieurs adresses, les séparer par un espace."
 
-# type: Plain text
-#: doc/apt-proxy-v1tov2.8:24
-msgid "Manuel Estrada Sainz E<lt>ranty at debian.orgE<gt>"
-msgstr "Manuel Estrada Sainz E<lt>ranty at debian.orgE<gt>"
+# type: TP
+#: doc/apt-proxy.conf.5:29
+#, no-wrap
+msgid "B<port>"
+msgstr "B<port>"
 
 # type: Plain text
-#: doc/apt-proxy-v1tov2.8:29 doc/apt-proxy-import.8:82
-msgid "B<apt-proxy>(8), B<apt-proxy.conf>(5)"
-msgstr "B<apt-proxy>(8), B<apt-proxy.conf>(5)"
-
-# type: TH
-#.  DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-#: doc/apt-proxy-import.8:2
-#, no-wrap
-msgid "APT-PROXY-IMPORT"
-msgstr "APT-PROXY-IMPORT"
+#: doc/apt-proxy.conf.5:32
+msgid "TCP port on which apt-proxy will listen for requests."
+msgstr "Le port TCP sur lequel apt-proxy sera à l'écoute des requêtes."
 
-# type: TH
-#.  DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-#: doc/apt-proxy-import.8:2
+# type: TP
+#: doc/apt-proxy.conf.5:33
 #, no-wrap
-msgid "March 2006"
-msgstr ""
+msgid "B<min_refresh_delay>"
+msgstr "B<min_refresh_delay>"
 
 # type: Plain text
-#: doc/apt-proxy-import.8:5
-msgid "apt-proxy-import - Import packages into the apt-proxy cache."
-msgstr "apt-proxy-import - Importe les paquets dans le cache d'apt-proxy."
+#: doc/apt-proxy.conf.5:38
+msgid ""
+"If different from B<off>, means that Packages and other control files will "
+"not be refreshed more frequently than this number of seconds\\&."
+msgstr ""
+"Si différent de B<off>, cela signifie que les fichiers Packages et les "
+"autres fichiers de contrôle ne seront pas rafraîchis plus fréquemment que ce "
+"nombre de secondes."
 
-# type: Plain text
-#: doc/apt-proxy-import.8:8
-msgid "B<apt-proxy-import> [I<options>] I<E<lt>filenameE<gt> >..."
-msgstr "B<apt-proxy-import> [I<options>] I<E<lt>[fichier de journalL<gt> >..."
+# type: TP
+#: doc/apt-proxy.conf.5:39 doc/apt-proxy.conf.5:103
+#, no-wrap
+msgid "B<timeout>"
+msgstr "B<timeout>"
 
 # type: Plain text
-#: doc/apt-proxy-import.8:11
+#: doc/apt-proxy.conf.5:44
 msgid ""
-"WARNING: apt-proxy has not been tested under this version of twisted "
-"(2.2.0).  WARNING: although it should work without problem."
+"Maximum I/O timeout in seconds for backend transfers. Default: 30 seconds.  "
+"If no response is received from a backend server in this time, apt-proxy "
+"will try the next server in the list.  Y"
 msgstr ""
+"Délai d'I/O dépassé pour les transferts. Défaut : 30 secondes. Si aucune "
+"réponse n'est reçue du serveur dans ce laps de temps, apt-proxy essaiera le "
+"serveur suivant de la liste."
 
-# type: Plain text
-#: doc/apt-proxy-import.8:13
-msgid "apt-proxy-import B<-r> [options] E<lt>directoryE<gt> ..."
-msgstr "apt-proxy-import B<-r> [options] E<lt>directoryE<gt> ..."
-
-# type: SH
-#: doc/apt-proxy-import.8:13
+# type: TP
+#: doc/apt-proxy.conf.5:45
 #, no-wrap
-msgid "OPTIONS"
-msgstr "OPTIONS"
+msgid "B<cache_dir>"
+msgstr "B<cache_dir>"
+
+# type: Plain text
+#: doc/apt-proxy.conf.5:48
+msgid "Cache directory.  Default: /var/cache/apt-proxy"
+msgstr "Répertoire de cache. Défaut : /var/cache/apt-proxy"
 
 # type: TP
-#: doc/apt-proxy-import.8:14
+#: doc/apt-proxy.conf.5:49
 #, no-wrap
-msgid "B<-V>, B<--version>"
-msgstr "B<-V>, B<--version>"
+msgid "B<cleanup_freq>"
+msgstr "B<cleanup_freq>"
 
 # type: Plain text
-#: doc/apt-proxy-import.8:17
-msgid "print version and quit"
-msgstr "Affiche la version"
+#: doc/apt-proxy.conf.5:54
+msgid ""
+"If different from B<off>, indicates the time between housekeeping attempts: "
+"delete files that have not been accessed in max_age, scan cache directories "
+"and update internal tables, ..."
+msgstr ""
+"Si différent de B<off>, cela indique la période entre les tentatives de "
+"nettoyage : suppression des fichiers qui n'ont pas été accédés depuis "
+"max_age, analyse des répertoires de cache, mise à jour des tables "
+"internes, ..."
 
 # type: TP
-#: doc/apt-proxy-import.8:17
+#: doc/apt-proxy.conf.5:55
 #, no-wrap
-msgid "B<-v>, B<--verbose>"
-msgstr "B<-v>, B<--verbose>"
+msgid "B<max_age>"
+msgstr "B<max_age>"
 
 # type: Plain text
-#: doc/apt-proxy-import.8:20
-msgid "give verbose output"
-msgstr "Sortie verbeuse"
+#: doc/apt-proxy.conf.5:59
+msgid ""
+"If different from B<off>, indicates the maximum age of files before deletion "
+"from the cache."
+msgstr ""
+"Si différent de B<off>, cela indique l'âge maximal des fichiers avant leur "
+"effacement du cache."
 
 # type: TP
-#: doc/apt-proxy-import.8:20
+#: doc/apt-proxy.conf.5:60
 #, no-wrap
-msgid "B<-d>, B<--debug>"
-msgstr "B<-d>, B<--debug>"
+msgid "B<max_versions>"
+msgstr "B<max_versions>"
 
 # type: Plain text
-#: doc/apt-proxy-import.8:23
-msgid "debug output"
-msgstr "Sortie debug"
+#: doc/apt-proxy.conf.5:67
+msgid ""
+"If different from B<off>, indicates the maximum number of versions of a \\&."
+"deb to keep.  This is the number of versions per distribution, for example "
+"setting max_versions to 2 will ensure that a maximum of 6 packages would be "
+"kept: the last 2 stable versions, the last 2 testing versions and the last 2 "
+"unstable versions."
+msgstr ""
+"Si différent de B<off>, cela indique le nombre maximum de version d'un "
+"paquet Debian à conserver. Il s'agit du nombre de versions par distribution. "
+"Par exemple, mettre max_versions à 2 assurera qu'un maximum de 6 paquets "
+"sera conservé : les deux dernières versions de stable, les deux dernières "
+"versions de testing et les deux dernières versions d'unstable."
 
 # type: TP
-#: doc/apt-proxy-import.8:23
+#: doc/apt-proxy.conf.5:68 doc/apt-proxy.conf.5:118
 #, no-wrap
-msgid "B<-q>, B<--quiet>"
-msgstr "B<-q>, B<--quiet>"
+msgid "B<passive_ftp>"
+msgstr "B<passive_ftp>"
 
 # type: Plain text
-#: doc/apt-proxy-import.8:26
-msgid "try not to write messages to stdout"
-msgstr "N'essaye pas d'écrire des messages dans stdout"
+#: doc/apt-proxy.conf.5:73
+msgid ""
+"Specify B<on> to use passive FTP, which works from behind a firewall, but "
+"may not be supported on all servers.  Specify B<off> to use active FTP "
+"instead.  Default: on"
+msgstr ""
+"Spécifiez B<on> pour utiliser le FTP passif, qui fonctionne à travers un "
+"pare-feu, mais n'est pas géré sur tous les serveurs. Spécifiez B<off> pour "
+"utiliser le FTP actif à la place. Défaut : on"
 
 # type: TP
-#: doc/apt-proxy-import.8:26
+#: doc/apt-proxy.conf.5:74 doc/apt-proxy.conf.5:127
 #, no-wrap
-msgid "B<-r>, B<--recursive>"
-msgstr "B<-r>, B<--recursive>"
+msgid "B<http_proxy>"
+msgstr "B<http_proxy>"
 
 # type: Plain text
-#: doc/apt-proxy-import.8:29
-msgid "recurse into subdirectories"
-msgstr "Récursif dans les sous répertoires"
+#: doc/apt-proxy.conf.5:78
+#, fuzzy
+msgid ""
+"Specify B<[username:password@]hostname:port> to use an upstream proxy.  "
+"Username and password are optional."
+msgstr "Indiquez B<nom d'hôte:port> pour utiliser un proxy amont."
+
+# type: TP
+#: doc/apt-proxy.conf.5:79
+#, no-wrap
+msgid "B<dynamic_backends>"
+msgstr "B<dynamic_backends>"
 
 # type: Plain text
-#: doc/apt-proxy-import.8:32
-msgid "Display this help and exit."
-msgstr "Affiche cette aide."
-
-# type: Plain text
-#: doc/apt-proxy-import.8:35
-msgid "Configuration file"
-msgstr "Fichier de configuration"
+#: doc/apt-proxy.conf.5:84
+msgid ""
+"By default apt-proxy will add HTTP backends dynamically if not already "
+"defined. Specify B<off> to restrict the available backends to those listed "
+"in the configuration file.  Default: on"
+msgstr ""
+"Par défaut, apt-proxy ajoutera les dorsaux HTTP dynamiquement s'ils ne sont "
+"pas déjà définis. Mettre à B<off> pour restreindre les dorsaux disponibles à "
+"ceux listés dans le fichier de configuration. Défaut : on"
 
-# type: Plain text
-#: doc/apt-proxy-import.8:37
-msgid "apt-proxy-import imports .deb files into the apt-proxy cache."
-msgstr " apt-proxy-import - Importe les paquets dans le cache d'apt-proxy."
+# type: TP
+#: doc/apt-proxy.conf.5:85
+#, no-wrap
+msgid "B<disable_pipelining>"
+msgstr "B<disable_pipelining>"
 
 # type: Plain text
-#: doc/apt-proxy-import.8:41
+#: doc/apt-proxy.conf.5:91
 msgid ""
-"It uses the package lists to determine where each file should be placed, so "
-"you should run B<'apt-get update'> to allow apt-proxy to update the package "
-"lists before running apt-proxy-import."
+"apt-proxy can use HTTP pipelining to fetch several files at once (up to 10), "
+"but this can generate multiple connections to each backend server.  "
+"Pipelining is disabled by default until this is fixed.  Set to B<0> to "
+"enable experimental http pipelining.  Default: 1"
+msgstr ""
+"apt-proxy peut utiliser la canalisation HTTP pour récupérer plusieurs "
+"fichiers en une fois (jusqu'à 10), mais ceci génère de multiples connexions "
+"sur chaque dorsal. La canalisation est désactivée par défaut jusqu'à ce que "
+"ce problème soit corrigé. Mettre à B<0> pour activer la canalisation "
+"expérimentale HTTP. Défaut : 1"
+
+# type: TP
+#: doc/apt-proxy.conf.5:92
+#, no-wrap
+msgid "B<bandwidth_limit = >I<amount>"
 msgstr ""
-"Il utilise la liste de paquets pour déterminer où sera placé chaque fichier, "
-"aussi vous devriez lancer la commande B<'apt-get update'> pour permettre à "
-"apt-proxy de mettre à jour la liste de paquets avant de lancer apt-proxy-"
-"import."
 
 # type: Plain text
-#: doc/apt-proxy-import.8:44
+#: doc/apt-proxy.conf.5:97
 msgid ""
-"WARNING: although it should work without problem.  apt-proxy-import 1.9.x"
+"When downloading from a backend server, limit the download speed to "
+"I<amount> bytes per second. Note this applies to B<http> and B<rsync> "
+"backends only. Default: no limit"
 msgstr ""
 
 # type: SH
-#: doc/apt-proxy-import.8:44
+#: doc/apt-proxy.conf.5:99
 #, no-wrap
-msgid "USING TO BOOTSTRAP A NEW APT-PROXY CACHE"
-msgstr "À UTILISER POUR REMPLIR UN NOUVEAU CACHE POUR APT-PROXY"
+msgid "RESOURCES"
+msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:48
+#: doc/apt-proxy.conf.5:102
+#, fuzzy
 msgid ""
-"If you have been using apt standalone, you probably have built up a large "
-"collection of .debs or .udebs in apt's cache directory.  You can import "
-"these files into apt-proxy as follows:"
+"All other sections in the configuration file will be interpreted as resource "
+"names.  The options in the section apply to this resource only."
 msgstr ""
-"Si vous aviez déjà utilisé apt, vous avez probablement créé une importante "
-"collection de fichiers .deb ou .udeb dans le répertoire cache d'apt. Vous "
-"pouvez importer ces fichiers dans apt-proxy comme suit :"
+"Toutes les autres sections devront être interprétées comme des noms de "
+"miroir, et les options qui y seront spécifiées seront spécifiques à ce "
+"miroir."
 
 # type: Plain text
-#: doc/apt-proxy-import.8:50
-msgid "1. Update apt-proxy's filelists:"
-msgstr "1. Mettre à jour la liste de fichiers d'apt-proxy :"
+#: doc/apt-proxy.conf.5:106
+msgid "Overrides the global timeout"
+msgstr "Supplanter le temps global d'expiration"
 
-# type: Plain text
-#: doc/apt-proxy-import.8:52
-#, no-wrap
-msgid "    apt-get update\n"
-msgstr "    apt-get update\n"
+# type: TP
+#: doc/apt-proxy.conf.5:107
+#, fuzzy, no-wrap
+msgid "B<backends = >I<E<lt>protocolE<gt>>B<://>I<E<lt>serverE<gt>>B</>I<E<lt>directoryE<gt>>B< [...]>"
+msgstr "B<miroirs = E<lt>protocoleE<gt>://E<lt>serveurE<gt>/E<lt>répertoireE<gt>>"
 
 # type: Plain text
-#: doc/apt-proxy-import.8:55
-msgid "2. Import files from apt's cache:"
-msgstr "2. Importer des fichiers depuis le cache d'apt :"
+#: doc/apt-proxy.conf.5:110
+msgid ""
+"A list one or more URLs referring to servers which hold debian packages\\&."
+msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:57
-#, no-wrap
-msgid "    apt-proxy-import -i /var/cache/apt/archives\n"
-msgstr "    apt-proxy-import -i /var/cache/apt/archives\n"
-
-# type: SH
-#: doc/apt-proxy-import.8:58
-#, no-wrap
-msgid "IMPORTING APT-MOVE CACHE"
-msgstr "IMPORTER LE CACHE D'APT-MOVE"
+#: doc/apt-proxy.conf.5:113
+#, fuzzy
+msgid "I<protocol>: internet protocol to use: http, ftp or rsync"
+msgstr "Protocole - protocole à utiliser : http, ftp ou rsync"
 
 # type: Plain text
-#: doc/apt-proxy-import.8:60
-msgid ""
-"You can import the apt-move generated cache into apt-proxy using the "
-"following command:"
-msgstr ""
-"Vous pouvez importer le cache généré par apt-move dans apt-proxy en "
-"utilisant la commande suivante :"
+#: doc/apt-proxy.conf.5:115
+#, fuzzy
+msgid "I<server>: hostname of the backend server to contact"
+msgstr "Serveur - nom d'hôte du miroir à contacter"
 
 # type: Plain text
-#: doc/apt-proxy-import.8:63
-#, no-wrap
-msgid "    apt-proxy-import -r -i /var/cache/apt-move\n"
-msgstr "    apt-proxy-import -r -i /var/cache/apt-move\n"
+#: doc/apt-proxy.conf.5:117
+#, fuzzy
+msgid "I<directory>: directory name to prepend requests to for this server"
+msgstr "Répertoire - nom du répertoire où ajouter des demandes pour ce serveur"
 
 # type: Plain text
-#: doc/apt-proxy-import.8:66
-msgid ""
-"This tells apt-proxy-import to recuse over each directory in the apt-move "
-"cache."
-msgstr ""
-"Cette commande demande à apt-proxy-import de parcourir chaque répertoire "
-"dans le cache d'apt-move."
+#: doc/apt-proxy.conf.5:121
+msgid "Override the global setting of passive_ftp"
+msgstr "Supplanter la configuration globale de passive_ftp"
 
-# type: Plain text
-#: doc/apt-proxy-import.8:68
-msgid "\\ /etc/apt-proxy/apt-proxy\\&.conf"
-msgstr "\\ /etc/apt-proxy/apt-proxy.conf"
+# type: TP
+#: doc/apt-proxy.conf.5:122
+#, no-wrap
+msgid "B<bandwidth_limit>"
+msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy-import.8:71
+#: doc/apt-proxy.conf.5:126
 msgid ""
-"apt-proxy-import does not use I<max_age> or I<max_versions> to clean the "
-"cache directory on import."
+"Set a bandwidth limit for downloads for this resource, overriding the global "
+"bandwidth_limit"
 msgstr ""
-"apt-proxy-import n'utilise pas les options I<max_age> ou I<max_versions> "
-"pour purger le répertoire cache pendant l'import."
 
 # type: Plain text
-#: doc/apt-proxy-import.8:73
-msgid "It does not yet import source.tar.gz or Packages files."
-msgstr "Il n'importe pas encore les fichiers source.tar.gz ou Packages."
+#: doc/apt-proxy.conf.5:131
+#, fuzzy
+msgid ""
+"Specify B<[username:password@]hostname:port> to use an upstream proxy, "
+"overriding the global http_proxy."
+msgstr "Indiquez B<nom d'hôte:port> pour utiliser un proxy amont."
 
-# type: Plain text
-#: doc/apt-proxy-import.8:75
-msgid "You must run it as the apt-proxy user or as root."
-msgstr "Vous devez le lancer en tant qu'utilisateur apt-proxy ou root."
+# type: SH
+#: doc/apt-proxy.conf.5:132
+#, fuzzy, no-wrap
+msgid "CONFIGURATION EXAMPLES"
+msgstr "CONFIGURATION DU CLIENT"
 
 # type: Plain text
-#: doc/apt-proxy-import.8:77
+#: doc/apt-proxy.conf.5:137
 msgid ""
-"Chris Halls E<lt>halls at debian.orgE<gt>, Manuel Estrada Sainz "
-"E<lt>ranty at debian.orgE<gt>"
+"To access a resource that's listed under a specific section name, simply "
+"append the section name (without the brackets) to the end of your deb source "
+"line in /etc/apt/sources.list"
 msgstr ""
-"Chris Halls E<lt>halls at debian.orgE<gt>, Manuel Estrada Sainz "
-"E<lt>ranty at debian.orgE<gt>"
 
 # type: TH
-#.  Man page copied from apt.conf man page.
-#: doc/apt-proxy.conf.5:2
-#, no-wrap
-msgid "apt-proxy\\&.conf"
-msgstr "apt-proxy.conf"
-
-# type: TH
-#.  Man page copied from apt.conf man page.
-#: doc/apt-proxy.conf.5:2
-#, fuzzy, no-wrap
-msgid "5 Jan 2006"
-msgstr "15 jul 2005"
+#: doc/apt-proxy.conf.5:139
+#, fuzzy
+msgid "B<Debian main>"
+msgstr "Debian GNU/Linux"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:5
-msgid "apt-proxy\\&.conf - configuration file for apt-proxy"
-msgstr "apt-proxy.conf - fichier de configuration pour apt-proxy"
+#: doc/apt-proxy.conf.5:142
+msgid ""
+"This example shows how to give clients access to the main Debian archive:"
+msgstr ""
+"Cet exemple montre comment donner aux clients l'accès à l'archive Debian "
+"principale :"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:9
-#, fuzzy
+#: doc/apt-proxy.conf.5:146
+#, no-wrap
 msgid ""
-"B<apt-proxy\\&.conf> is the configuration file for apt-proxy.  When apt-"
-"proxy starts up, it will read I</etc/apt-proxy/apt-proxy\\&.conf>\\&."
+"[debian]\n"
+"backends = http://ftp.us.debian.org/debian/\n"
+"           http://ftp.de.debian.org/debian/\n"
 msgstr ""
-"B<apt-proxy.conf> est le fichier de configuration pour apt-proxy. Au "
-"démarrage d'apt-proxy, il lira le fichier B</etc/apt-proxy/apt-proxy.conf>."
+"[debian]\n"
+"backends = http://ftp.us.debian.org/debian/\n"
+"            http://ftp.fr.debian.org/debian/\n"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:12
+#: doc/apt-proxy.conf.5:151
 #, fuzzy
 msgid ""
-"I</etc/apt-proxy/apt-proxy-v2\\&.conf> will be read instead if it exists to "
-"make upgrading from v1 easier."
+"Using this configuration, the client would use a I<sources.list> entry like:"
 msgstr ""
-"B</etc/apt-proxy/apt-proxy-v2.conf> sera lu à la place s'il existe afin de "
-"rendre la mise à jour depuis la version 1 plus transparente."
+"En utilisant cette configuration, le client utilisera une entrée B<sources."
+"list> comme ceci :"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:15
-msgid ""
-"The configuration file is divided up into several sections, where each I<"
-"[resource]> section defines a separate resource. The B<DEFAULT> section "
-"applies to all resources."
-msgstr ""
+#: doc/apt-proxy.conf.5:154
+#, fuzzy, no-wrap
+msgid "    deb http://server:9999/debian woody main\n"
+msgstr "    deb http://SERVEUR:9999/debian/ woody main\n"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:19
-#, fuzzy
+#: doc/apt-proxy.conf.5:159
 msgid ""
-"The supplied I<apt-proxy\\&.conf> will work out of the box, but it is best "
-"to change the backends you use to a mirror closer to you.  There are some in "
-"the default file, and it may be enough just to reorder the lines in the file"
-"\\&."
+"And so the file request `/debian/woody/main/binary-i386/x11/foo_1-1.deb' "
+"would turn into a backend request of first"
 msgstr ""
-"Le fichier apt-proxy.conf fourni devrait fonctionner tel quel, mais il est "
-"suggéré de choisir un miroir plus proche de vous. Certains sont dans le "
-"fichier apt-proxy.conf par défaut et il devrait suffire de réordonner les "
-"lignes dans ce fichier."
+"Ainsi, la demande du fichier « /debian/woody/main/binary-i386/x11/foo_1-1."
+"deb » sera convertie en une demande d'abord de"
 
-# type: SH
-#: doc/apt-proxy.conf.5:21
+# type: Plain text
+#: doc/apt-proxy.conf.5:162
 #, no-wrap
-msgid "[DEFAULT]"
-msgstr "[DÉFAUT]"
+msgid "    `http://ftp.us.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb'\n"
+msgstr "    « http://ftp.us.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb »\n"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:23
-msgid "This section holds options global to the whole apt-proxy:"
-msgstr "Cette section contient les options globales d'apt-proxy :"
+#: doc/apt-proxy.conf.5:165
+msgid "and if that failed,"
+msgstr "et, en cas d'échec, de"
 
-# type: TP
-#: doc/apt-proxy.conf.5:24
+# type: Plain text
+#: doc/apt-proxy.conf.5:168
 #, no-wrap
-msgid "B<address>"
-msgstr "B<address>"
+msgid "    `http://ftp.de.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb'\n"
+msgstr "    « http://ftp.fr.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb »\n"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:28
-msgid ""
-"IP address on which apt-proxy will listen for requests. Multiple addresses "
-"have a empty space between it."
+#: doc/apt-proxy.conf.5:171
+msgid "and apt-proxy will place the downloaded package in"
 msgstr ""
-"L'adresse IP sur laquelle apt-proxy sera à l'écoute des requêtes. S'il y a "
-"plusieurs adresses, les séparer par un espace."
 
-# type: TP
-#: doc/apt-proxy.conf.5:29
+# type: Plain text
+#: doc/apt-proxy.conf.5:173
 #, no-wrap
-msgid "B<port>"
+msgid "    `/var/cache/apt-proxy/debian/debian/woody/main/binary-i386/x11/foo_1-1.deb'\\&.\n"
+msgstr "     « /var/cache/apt-proxy/debian/debian/woody/main/binary-i386/x11/foo_1-1.deb ».\n"
+
+# type: TP
+#: doc/apt-proxy.conf.5:176
+#, fuzzy
+msgid "B<backports.org>"
 msgstr "B<port>"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:32
-msgid "TCP port on which apt-proxy will listen for requests."
-msgstr "Le port TCP sur lequel apt-proxy sera à l'écoute des requêtes."
+#: doc/apt-proxy.conf.5:178
+msgid "The backports.org website tells you to use this I<sources.list> line:"
+msgstr ""
 
-# type: TP
-#: doc/apt-proxy.conf.5:33
+# type: Plain text
+#: doc/apt-proxy.conf.5:181
 #, no-wrap
-msgid "B<min_refresh_delay>"
-msgstr "B<min_refresh_delay>"
+msgid "    deb http://www.backports.org/debian sarge-backports main\n"
+msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:38
+#: doc/apt-proxy.conf.5:185
 msgid ""
-"If different from B<off>, means that Packages and other control files will "
-"not be refreshed more frequently than this number of seconds\\&."
+"You can add this to apt-proxy by creating a new section in I<apt-proxy\\&."
+"conf>\\&.  In the new section, add a backends entry for the URL:"
 msgstr ""
-"Si différent de B<off>, cela signifie que les fichiers Packages et les "
-"autres fichiers de contrôle ne seront pas rafraîchis plus fréquemment que ce "
-"nombre de secondes."
 
-# type: TP
-#: doc/apt-proxy.conf.5:39 doc/apt-proxy.conf.5:96
+# type: Plain text
+#: doc/apt-proxy.conf.5:189
 #, no-wrap
-msgid "B<timeout>"
-msgstr "B<timeout>"
+msgid ""
+"    [backports]\n"
+"    backends = http://www.backports.org/debian\n"
+msgstr ""
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:44
+#: doc/apt-proxy.conf.5:194
 msgid ""
-"Maximum I/O timeout in seconds for backend transfers. Default: 30 seconds.  "
-"If no response is received from a backend server in this time, apt-proxy "
-"will try the next server in the list.  Y"
+"On the clients, replace the URL with one pointing to the apt-proxy resource "
+"name, in the form I<http://hostname:port/backend>. If your apt-proxy "
+"hostname is I<proxy> and it is running on port 9999, you would write:"
 msgstr ""
-"Délai d'I/O dépassé pour les transferts. Défaut : 30 secondes. Si aucune "
-"réponse n'est reçue du serveur dans ce laps de temps, apt-proxy essaiera le "
-"serveur suivant de la liste."
-
-# type: TP
-#: doc/apt-proxy.conf.5:45
-#, no-wrap
-msgid "B<cache_dir>"
-msgstr "B<cache_dir>"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:48
-msgid "Cache directory.  Default: /var/cache/apt-proxy"
-msgstr "Répertoire de cache. Défaut : /var/cache/apt-proxy"
-
-# type: TP
-#: doc/apt-proxy.conf.5:49
-#, no-wrap
-msgid "B<cleanup_freq>"
-msgstr "B<cleanup_freq>"
+#: doc/apt-proxy.conf.5:197
+#, fuzzy, no-wrap
+msgid "   deb http://proxy:9999/backports sarge-backports main\n"
+msgstr "    deb http://SERVEUR:9999/debian/ woody main\n"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:54
+#: doc/apt-proxy.conf.5:202
+#, fuzzy
 msgid ""
-"If different from B<off>, indicates the time between housekeeping attempts: "
-"delete files that have not been accessed in max_age, scan cache directories "
-"and update internal tables, ..."
+"For many more examples, see the supplied /etc/apt-proxy/apt-proxy\\&.conf\\&."
 msgstr ""
-"Si différent de B<off>, cela indique la période entre les tentatives de "
-"nettoyage : suppression des fichiers qui n'ont pas été accédés depuis "
-"max_age, analyse des répertoires de cache, mise à jour des tables "
-"internes, ..."
+"Pour d'autres exemples, voir le fichier /etc/apt-proxy/apt-proxy.conf.\n"
 
-# type: TP
-#: doc/apt-proxy.conf.5:55
-#, no-wrap
-msgid "B<max_age>"
-msgstr "B<max_age>"
+# type: Plain text
+#: doc/apt-proxy.conf.5:205 doc/apt-proxy-v1tov2.8:20
+msgid "/etc/apt-proxy/apt-proxy\\&.conf"
+msgstr "/etc/apt-proxy/apt-proxy.conf"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:59
+#: doc/apt-proxy.conf.5:207 doc/apt-proxy-v1tov2.8:22
+msgid "/etc/apt-proxy/apt-proxy-v2\\&.conf"
+msgstr "/etc/apt-proxy/apt-proxy-v2.conf"
+
+# type: Plain text
+#: doc/apt-proxy.conf.5:213
 msgid ""
-"If different from B<off>, indicates the maximum age of files before deletion "
-"from the cache."
+"B<apt-proxy(8),> B</usr/share/doc/apt-proxy/README,> B<apt-proxy-import(8)>"
 msgstr ""
-"Si différent de B<off>, cela indique l'âge maximal des fichiers avant leur "
-"effacement du cache."
+"B<apt-proxy>(8), B</usr/share/doc/apt-proxy/README,>B<apt-proxy-import>(8)"
 
-# type: TP
-#: doc/apt-proxy.conf.5:60
+# type: Plain text
+#: doc/apt-proxy.conf.5:218
+msgid "Plenty sure.  Please report."
+msgstr "Certainement. Veuillez nous en faire part."
+
+# type: SH
+#: doc/apt-proxy.conf.5:219
 #, no-wrap
-msgid "B<max_versions>"
-msgstr "B<max_versions>"
+msgid "AUTHOR"
+msgstr "AUTEUR"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:67
+#: doc/apt-proxy.conf.5:220
 msgid ""
-"If different from B<off>, indicates the maximum number of versions of a \\&."
-"deb to keep.  This is the number of versions per distribution, for example "
-"setting max_versions to 2 will ensure that a maximum of 6 packages would be "
-"kept: the last 2 stable versions, the last 2 testing versions and the last 2 "
-"unstable versions."
+"apt-proxy v2 was written by Manuel Estrada Sainz E<lt>ranty at debian.orgE<gt>"
+"\\&."
 msgstr ""
-"Si différent de B<off>, cela indique le nombre maximum de version d'un "
-"paquet Debian à conserver. Il s'agit du nombre de versions par distribution. "
-"Par exemple, mettre max_versions à 2 assurera qu'un maximum de 6 paquets "
-"sera conservé : les deux dernières versions de stable, les deux dernières "
-"versions de testing et les deux dernières versions d'unstable."
+"apt-proxy v2 a été écrit par Manuel Estrada Sainz E<lt>ranty at debian.orgE<gt>."
 
-# type: TP
-#: doc/apt-proxy.conf.5:68 doc/apt-proxy.conf.5:111
+# type: TH
+#: doc/apt-proxy-import.8:2
 #, no-wrap
-msgid "B<passive_ftp>"
-msgstr "B<passive_ftp>"
+msgid "APT-PROXY-IMPORT"
+msgstr "APT-PROXY-IMPORT"
 
-# type: Plain text
-#: doc/apt-proxy.conf.5:73
-msgid ""
-"Specify B<on> to use passive FTP, which works from behind a firewall, but "
-"may not be supported on all servers.  Specify B<off> to use active FTP "
-"instead.  Default: on"
+# type: TH
+#: doc/apt-proxy-import.8:2
+#, no-wrap
+msgid "August 2006"
 msgstr ""
-"Spécifiez B<on> pour utiliser le FTP passif, qui fonctionne à travers un "
-"pare-feu, mais n'est pas géré sur tous les serveurs. Spécifiez B<off> pour "
-"utiliser le FTP actif à la place. Défaut : on"
 
-# type: TP
-#: doc/apt-proxy.conf.5:74
+# type: TH
+#: doc/apt-proxy-import.8:2 doc/apt-proxy-v1tov2.8:1
 #, no-wrap
-msgid "B<http_proxy>"
-msgstr "B<http_proxy>"
+msgid "Debian GNU/Linux"
+msgstr "Debian GNU/Linux"
+
+# type: TH
+#: doc/apt-proxy-import.8:2 doc/apt-proxy-v1tov2.8:1
+#, fuzzy, no-wrap
+msgid " "
+msgstr " "
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:77
-msgid "Specify B<hostname:port> to use an upstream proxy."
-msgstr "Indiquez B<nom d'hôte:port> pour utiliser un proxy amont."
+#: doc/apt-proxy-import.8:5
+msgid "apt-proxy-import - Import packages into the apt-proxy cache."
+msgstr "apt-proxy-import - Importe les paquets dans le cache d'apt-proxy."
 
-# type: TP
-#: doc/apt-proxy.conf.5:78
-#, no-wrap
-msgid "B<dynamic_backends>"
-msgstr "B<dynamic_backends>"
+# type: Plain text
+#: doc/apt-proxy-import.8:8
+msgid "B<apt-proxy-import> [I<options>] I<E<lt>filenameE<gt> >..."
+msgstr "B<apt-proxy-import> [I<options>] I<E<lt>[fichier de journalL<gt> >..."
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:83
-msgid ""
-"By default apt-proxy will add HTTP backends dynamically if not already "
-"defined. Specify B<off> to restrict the available backends to those listed "
-"in the configuration file.  Default: on"
-msgstr ""
-"Par défaut, apt-proxy ajoutera les dorsaux HTTP dynamiquement s'ils ne sont "
-"pas déjà définis. Mettre à B<off> pour restreindre les dorsaux disponibles à "
-"ceux listés dans le fichier de configuration. Défaut : on"
+#: doc/apt-proxy-import.8:11
+msgid "apt-proxy-import B<-r> [options] E<lt>directoryE<gt> ..."
+msgstr "apt-proxy-import B<-r> [options] E<lt>directoryE<gt> ..."
+
+# type: SH
+#: doc/apt-proxy-import.8:11
+#, no-wrap
+msgid "OPTIONS"
+msgstr "OPTIONS"
 
 # type: TP
-#: doc/apt-proxy.conf.5:84
+#: doc/apt-proxy-import.8:12
 #, no-wrap
-msgid "B<disable_pipelining>"
-msgstr "B<disable_pipelining>"
+msgid "B<-V>, B<--version>"
+msgstr "B<-V>, B<--version>"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:90
-msgid ""
-"apt-proxy can use HTTP pipelining to fetch several files at once (up to 10), "
-"but this can generate multiple connections to each backend server.  "
-"Pipelining is disabled by default until this is fixed.  Set to B<0> to "
-"enable experimental http pipelining.  Default: 1"
-msgstr ""
-"apt-proxy peut utiliser la canalisation HTTP pour récupérer plusieurs "
-"fichiers en une fois (jusqu'à 10), mais ceci génère de multiples connexions "
-"sur chaque dorsal. La canalisation est désactivée par défaut jusqu'à ce que "
-"ce problème soit corrigé. Mettre à B<0> pour activer la canalisation "
-"expérimentale HTTP. Défaut : 1"
+#: doc/apt-proxy-import.8:15
+msgid "print version and quit"
+msgstr "Affiche la version"
 
-# type: SH
-#: doc/apt-proxy.conf.5:92
+# type: TP
+#: doc/apt-proxy-import.8:15
 #, no-wrap
-msgid "RESOURCES"
-msgstr ""
-
-# type: Plain text
-#: doc/apt-proxy.conf.5:95
-#, fuzzy
-msgid ""
-"All other sections in the configuration file will be interpreted as resource "
-"names.  The options in the section apply to this resource only."
-msgstr ""
-"Toutes les autres sections devront être interprétées comme des noms de "
-"miroir, et les options qui y seront spécifiées seront spécifiques à ce "
-"miroir."
+msgid "B<-v>, B<--verbose>"
+msgstr "B<-v>, B<--verbose>"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:99
-msgid "Overrides the global timeout"
-msgstr "Supplanter le temps global d'expiration"
+#: doc/apt-proxy-import.8:18
+msgid "give verbose output"
+msgstr "Sortie verbeuse"
 
 # type: TP
-#: doc/apt-proxy.conf.5:100
-#, fuzzy, no-wrap
-msgid "B<backends = >I<E<lt>protocolE<gt>>B<://>I<E<lt>serverE<gt>>B</>I<E<lt>directoryE<gt>>B< [...]>"
-msgstr "B<miroirs = E<lt>protocoleE<gt>://E<lt>serveurE<gt>/E<lt>répertoireE<gt>>"
+#: doc/apt-proxy-import.8:18
+#, no-wrap
+msgid "B<-d>, B<--debug>"
+msgstr "B<-d>, B<--debug>"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:103
-msgid ""
-"A list one or more URLs referring to servers which hold debian packages\\&."
-msgstr ""
+#: doc/apt-proxy-import.8:21
+msgid "debug output"
+msgstr "Sortie debug"
+
+# type: TP
+#: doc/apt-proxy-import.8:21
+#, no-wrap
+msgid "B<-q>, B<--quiet>"
+msgstr "B<-q>, B<--quiet>"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:106
-#, fuzzy
-msgid "I<protocol>: internet protocol to use: http, ftp or rsync"
-msgstr "Protocole - protocole à utiliser : http, ftp ou rsync"
+#: doc/apt-proxy-import.8:24
+msgid "try not to write messages to stdout"
+msgstr "N'essaye pas d'écrire des messages dans stdout"
+
+# type: TP
+#: doc/apt-proxy-import.8:24
+#, no-wrap
+msgid "B<-r>, B<--recursive>"
+msgstr "B<-r>, B<--recursive>"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:108
-#, fuzzy
-msgid "I<server>: hostname of the backend server to contact"
-msgstr "Serveur - nom d'hôte du miroir à contacter"
+#: doc/apt-proxy-import.8:27
+msgid "recurse into subdirectories"
+msgstr "Récursif dans les sous répertoires"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:110
-#, fuzzy
-msgid "I<directory>: directory name to prepend requests to for this server"
-msgstr "Répertoire - nom du répertoire où ajouter des demandes pour ce serveur"
+#: doc/apt-proxy-import.8:30
+msgid "Display this help and exit."
+msgstr "Affiche cette aide."
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:114
-msgid "Override the global setting of passive_ftp"
-msgstr "Supplanter la configuration globale de passive_ftp"
+#: doc/apt-proxy-import.8:33
+msgid "Configuration file"
+msgstr "Fichier de configuration"
 
-# type: SH
-#: doc/apt-proxy.conf.5:115
-#, fuzzy, no-wrap
-msgid "CONFIGURATION EXAMPLES"
-msgstr "CONFIGURATION DU CLIENT"
+# type: Plain text
+#: doc/apt-proxy-import.8:35
+msgid "apt-proxy-import imports .deb files into the apt-proxy cache."
+msgstr " apt-proxy-import - Importe les paquets dans le cache d'apt-proxy."
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:120
+#: doc/apt-proxy-import.8:39
 msgid ""
-"To access a resource that's listed under a specific section name, simply "
-"append the section name (without the brackets) to the end of your deb source "
-"line in /etc/apt/sources.list"
+"It uses the package lists to determine where each file should be placed, so "
+"you should run B<'apt-get update'> to allow apt-proxy to update the package "
+"lists before running apt-proxy-import."
 msgstr ""
+"Il utilise la liste de paquets pour déterminer où sera placé chaque fichier, "
+"aussi vous devriez lancer la commande B<'apt-get update'> pour permettre à "
+"apt-proxy de mettre à jour la liste de paquets avant de lancer apt-proxy-"
+"import."
 
-# type: TH
-#: doc/apt-proxy.conf.5:122
-#, fuzzy
-msgid "B<Debian main>"
-msgstr "Debian GNU/Linux"
+# type: SH
+#: doc/apt-proxy-import.8:39
+#, no-wrap
+msgid "USING TO BOOTSTRAP A NEW APT-PROXY CACHE"
+msgstr "À UTILISER POUR REMPLIR UN NOUVEAU CACHE POUR APT-PROXY"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:125
+#: doc/apt-proxy-import.8:43
 msgid ""
-"This example shows how to give clients access to the main Debian archive:"
+"If you have been using apt standalone, you probably have built up a large "
+"collection of .debs or .udebs in apt's cache directory.  You can import "
+"these files into apt-proxy as follows:"
 msgstr ""
-"Cet exemple montre comment donner aux clients l'accès à l'archive Debian "
-"principale :"
+"Si vous aviez déjà utilisé apt, vous avez probablement créé une importante "
+"collection de fichiers .deb ou .udeb dans le répertoire cache d'apt. Vous "
+"pouvez importer ces fichiers dans apt-proxy comme suit :"
+
+# type: Plain text
+#: doc/apt-proxy-import.8:45
+msgid "1. Update apt-proxy's filelists:"
+msgstr "1. Mettre à jour la liste de fichiers d'apt-proxy :"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:129
+#: doc/apt-proxy-import.8:47
 #, no-wrap
-msgid ""
-"[debian]\n"
-"backends = http://ftp.us.debian.org/debian/\n"
-"           http://ftp.de.debian.org/debian/\n"
-msgstr ""
-"[debian]\n"
-"backends = http://ftp.us.debian.org/debian/\n"
-"            http://ftp.fr.debian.org/debian/\n"
+msgid "    apt-get update\n"
+msgstr "    apt-get update\n"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:134
-#, fuzzy
-msgid ""
-"Using this configuration, the client would use a I<sources.list> entry like:"
-msgstr ""
-"En utilisant cette configuration, le client utilisera une entrée B<sources."
-"list> comme ceci :"
+#: doc/apt-proxy-import.8:50
+msgid "2. Import files from apt's cache:"
+msgstr "2. Importer des fichiers depuis le cache d'apt :"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:137
+#: doc/apt-proxy-import.8:52
 #, fuzzy, no-wrap
-msgid "    deb http://server:9999/debian woody main\n"
-msgstr "    deb http://SERVEUR:9999/debian/ woody main\n"
+msgid "    apt-proxy-import /var/cache/apt/archives\n"
+msgstr "    apt-proxy-import -i /var/cache/apt/archives\n"
+
+# type: SH
+#: doc/apt-proxy-import.8:53
+#, no-wrap
+msgid "IMPORTING APT-MOVE CACHE"
+msgstr "IMPORTER LE CACHE D'APT-MOVE"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:142
+#: doc/apt-proxy-import.8:55
 msgid ""
-"And so the file request `/debian/woody/main/binary-i386/x11/foo_1-1.deb' "
-"would turn into a backend request of first"
+"You can import the apt-move generated cache into apt-proxy using the "
+"following command:"
 msgstr ""
-"Ainsi, la demande du fichier « /debian/woody/main/binary-i386/x11/foo_1-1."
-"deb » sera convertie en une demande d'abord de"
+"Vous pouvez importer le cache généré par apt-move dans apt-proxy en "
+"utilisant la commande suivante :"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:145
-#, no-wrap
-msgid "    `http://ftp.us.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb'\n"
-msgstr "    « http://ftp.us.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb »\n"
+#: doc/apt-proxy-import.8:58
+#, fuzzy, no-wrap
+msgid "    apt-proxy-import -r /var/cache/apt-move\n"
+msgstr "    apt-proxy-import -r -i /var/cache/apt-move\n"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:148
-msgid "and if that failed,"
-msgstr "et, en cas d'échec, de"
+#: doc/apt-proxy-import.8:61
+msgid ""
+"This tells apt-proxy-import to recuse over each directory in the apt-move "
+"cache."
+msgstr ""
+"Cette commande demande à apt-proxy-import de parcourir chaque répertoire "
+"dans le cache d'apt-move."
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:151
-#, no-wrap
-msgid "    `http://ftp.de.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb'\n"
-msgstr "    « http://ftp.fr.debian.org/debian/woody/main/binary-i386/x11/foo_1-1.deb »\n"
+#: doc/apt-proxy-import.8:63
+msgid "\\ /etc/apt-proxy/apt-proxy\\&.conf"
+msgstr "\\ /etc/apt-proxy/apt-proxy.conf"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:154
-msgid "and apt-proxy will place the downloaded package in"
+#: doc/apt-proxy-import.8:66
+msgid ""
+"apt-proxy-import does not use I<max_age> or I<max_versions> to clean the "
+"cache directory on import."
 msgstr ""
+"apt-proxy-import n'utilise pas les options I<max_age> ou I<max_versions> "
+"pour purger le répertoire cache pendant l'import."
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:156
-#, no-wrap
-msgid "    `/var/cache/apt-proxy/debian/debian/woody/main/binary-i386/x11/foo_1-1.deb'\\&.\n"
-msgstr "     « /var/cache/apt-proxy/debian/debian/woody/main/binary-i386/x11/foo_1-1.deb ».\n"
-
-# type: TP
-#: doc/apt-proxy.conf.5:159
-#, fuzzy
-msgid "B<backports.org>"
-msgstr "B<port>"
-
-# type: Plain text
-#: doc/apt-proxy.conf.5:161
-msgid "The backports.org website tells you to use this I<sources.list> line:"
-msgstr ""
+#: doc/apt-proxy-import.8:68
+msgid "It does not yet import source.tar.gz or Packages files."
+msgstr "Il n'importe pas encore les fichiers source.tar.gz ou Packages."
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:164
-#, no-wrap
-msgid "    deb http://www.backports.org/debian sarge-backports main\n"
-msgstr ""
+#: doc/apt-proxy-import.8:70
+msgid "You must run it as the apt-proxy user or as root."
+msgstr "Vous devez le lancer en tant qu'utilisateur apt-proxy ou root."
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:168
+#: doc/apt-proxy-import.8:72
 msgid ""
-"You can add this to apt-proxy by creating a new section in I<apt-proxy\\&."
-"conf>\\&.  In the new section, add a backends entry for the URL:"
+"Chris Halls E<lt>halls at debian.orgE<gt>, Manuel Estrada Sainz "
+"E<lt>ranty at debian.orgE<gt>"
 msgstr ""
+"Chris Halls E<lt>halls at debian.orgE<gt>, Manuel Estrada Sainz "
+"E<lt>ranty at debian.orgE<gt>"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:172
+#: doc/apt-proxy-import.8:77 doc/apt-proxy-v1tov2.8:29
+msgid "B<apt-proxy>(8), B<apt-proxy.conf>(5)"
+msgstr "B<apt-proxy>(8), B<apt-proxy.conf>(5)"
+
+# type: TH
+#: doc/apt-proxy-v1tov2.8:1
 #, no-wrap
-msgid ""
-"    [backports]\n"
-"    backends = http://www.backports.org/debian\n"
-msgstr ""
+msgid "APT-PROXY-V1TOV2"
+msgstr "APT-PROXY-V1TOV2"
+
+# type: TH
+#: doc/apt-proxy-v1tov2.8:1
+#, no-wrap
+msgid "November 2002"
+msgstr "novembre 2002"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:177
-msgid ""
-"On the clients, replace the URL with one pointing to the apt-proxy resource "
-"name, in the form I<http://hostname:port/backend>. If your apt-proxy "
-"hostname is I<proxy> and it is running on port 9999, you would write:"
+#: doc/apt-proxy-v1tov2.8:4
+msgid "apt-proxy-v1tov2 - Updates apt-proxy configuration to the new format."
 msgstr ""
+"apt-proxy-v1tov2 - Convertit la configuration d'apt-proxy vers le nouveau "
+"format."
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:180
-#, fuzzy, no-wrap
-msgid "   deb http://proxy:9999/backports sarge-backports main\n"
-msgstr "    deb http://SERVEUR:9999/debian/ woody main\n"
+#: doc/apt-proxy-v1tov2.8:7
+msgid "B<apt-proxy-v1tov2> [v1_conf [v2_sample_conf]] E<gt> v2_conf"
+msgstr "B<apt-proxy-v1tov2> [v1_conf [v2_exemple_conf]] E<gt> v2_conf"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:185
-#, fuzzy
+#: doc/apt-proxy-v1tov2.8:11
 msgid ""
-"For many more examples, see the supplied /etc/apt-proxy/apt-proxy\\&.conf\\&."
+"apt-proxy-v1tov2 tries to update I<v2_sample_conf> with the configuration "
+"found in I<v1_conf> and writes the result to I<stdout>."
 msgstr ""
-"Pour d'autres exemples, voir le fichier /etc/apt-proxy/apt-proxy.conf.\n"
+"apt-proxy-v1tov2 tente de convertir I<v2_exemple_conf> avec la configuration "
+"trouvée dans le fichier I<v1_conf> et écrira le résultat sur I<stdout>."
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:196
+#: doc/apt-proxy-v1tov2.8:14
 msgid ""
-"B<apt-proxy(8),> B</usr/share/doc/apt-proxy/README,> B<apt-proxy-import(8)>"
+"By default, it will use /etc/apt-proxy/apt-proxy.conf for I<v1_conf> and /"
+"etc/apt-proxy/apt-proxy-v2.conf for I<v2_sample_conf>."
 msgstr ""
-"B<apt-proxy>(8), B</usr/share/doc/apt-proxy/README,>B<apt-proxy-import>(8)"
-
-# type: Plain text
-#: doc/apt-proxy.conf.5:201
-msgid "Plenty sure.  Please report."
-msgstr "Certainement. Veuillez nous en faire part."
+"Par défaut, il utilisera /etc/apt-proxy/apt-proxy.conf pour I<v1_conf> et /"
+"etc/apt-proxy/apt-proxy-v2.conf pour I<v2_example_conf>."
 
 # type: SH
-#: doc/apt-proxy.conf.5:202
+#: doc/apt-proxy-v1tov2.8:15
 #, no-wrap
-msgid "AUTHOR"
-msgstr "AUTEUR"
+msgid "NOTES"
+msgstr "NOTES"
 
 # type: Plain text
-#: doc/apt-proxy.conf.5:203
-msgid ""
-"apt-proxy v2 was written by Manuel Estrada Sainz E<lt>ranty at debian.orgE<gt>"
-"\\&."
+#: doc/apt-proxy-v1tov2.8:17
+msgid "Hopefully the package maintainer scripts have already run this for you."
 msgstr ""
-"apt-proxy v2 a été écrit par Manuel Estrada Sainz E<lt>ranty at debian.orgE<gt>."
+"Vraisemblablement, les scripts du responsable de paquet doivent déjà l'avoir "
+"fait pour vous."
+
+# type: Plain text
+#: doc/apt-proxy-v1tov2.8:24
+msgid "Manuel Estrada Sainz E<lt>ranty at debian.orgE<gt>"
+msgstr "Manuel Estrada Sainz E<lt>ranty at debian.orgE<gt>"
 
 # type: TH
 #~ msgid "October 2005"



More information about the apt-proxy-devel mailing list