[apt-proxy-devel] r681 - in branches/1.9.36: debian doc doc/po
Chris Halls
halls at alioth.debian.org
Tue Mar 25 12:46:14 UTC 2008
Author: halls
Date: Tue Mar 25 12:46:14 2008
New Revision: 681
Log:
* fix FTBFS: po4a fails. Thanks to Miguel Gea Milvaques for the partial solution. Added more temporary hacks but it seems we are using help2man in the wrong way for French translations at the moment. (Closes: #470345)
Modified:
branches/1.9.36/debian/changelog
branches/1.9.36/doc/apt-proxy.conf.5
branches/1.9.36/doc/po/apt-proxy.pot
branches/1.9.36/doc/po/fr.po
Modified: branches/1.9.36/debian/changelog
==============================================================================
--- branches/1.9.36/debian/changelog (original)
+++ branches/1.9.36/debian/changelog Tue Mar 25 12:46:14 2008
@@ -1,3 +1,11 @@
+apt-proxy (1.9.36.2~svn) unstable; urgency=low
+
+ * fix FTBFS: po4a fails. Thanks to Miguel Gea Milvaques for the partial
+ solution. Added more temporary hacks but it seems we are using help2man
+ in the wrong way for French translations at the moment. (Closes: #470345)
+
+ -- Chris Halls <halls at debian.org> Tue, 25 Mar 2008 12:43:32 +0000
+
apt-proxy (1.9.36.1) unstable; urgency=low
* Work around breakage caused by ABI change in python_apt.
Modified: branches/1.9.36/doc/apt-proxy.conf.5
==============================================================================
--- branches/1.9.36/doc/apt-proxy.conf.5 (original)
+++ branches/1.9.36/doc/apt-proxy.conf.5 Tue Mar 25 12:46:14 2008
@@ -105,7 +105,7 @@
Overrides the global timeout
.TP
-.B backends = "\fI<protocol>\fP://\fI<server>\fP/\fI<directory>\fP [...]"
+.B backends = "<protocol>://<server>/<directory> [...]"
A list one or more URLs referring to servers which hold debian packages\&.
.br
.br
Modified: branches/1.9.36/doc/po/apt-proxy.pot
==============================================================================
--- branches/1.9.36/doc/po/apt-proxy.pot (original)
+++ branches/1.9.36/doc/po/apt-proxy.pot Tue Mar 25 12:46:14 2008
@@ -1,12 +1,13 @@
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-02-03 12:02+0100\n"
+"POT-Creation-Date: 2008-03-25 12:15+0000\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"
@@ -159,7 +160,7 @@
msgstr ""
# type: SH
-#: doc/apt-proxy.8:56 doc/apt-proxy.conf.5:203 doc/apt-proxy-import.8:61 doc/apt-proxy-v1tov2.8:18
+#: doc/apt-proxy.8:56 doc/apt-proxy.conf.5:208 doc/apt-proxy-import.8:61 doc/apt-proxy-v1tov2.8:18
#, no-wrap
msgid "FILES"
msgstr ""
@@ -170,7 +171,7 @@
msgstr ""
# type: SH
-#: doc/apt-proxy.8:61 doc/apt-proxy.conf.5:207 doc/apt-proxy-import.8:72 doc/apt-proxy-v1tov2.8:24
+#: doc/apt-proxy.8:61 doc/apt-proxy.conf.5:212 doc/apt-proxy-import.8:72 doc/apt-proxy-v1tov2.8:24
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@ -181,7 +182,7 @@
msgstr ""
# type: SH
-#: doc/apt-proxy.8:68 doc/apt-proxy.conf.5:216 doc/apt-proxy-import.8:63
+#: doc/apt-proxy.8:68 doc/apt-proxy.conf.5:221 doc/apt-proxy-import.8:63
#, no-wrap
msgid "BUGS"
msgstr ""
@@ -297,26 +298,26 @@
msgstr ""
# type: TP
-#: doc/apt-proxy.conf.5:33
+#: doc/apt-proxy.conf.5:33 doc/apt-proxy.conf.5:132
#, no-wrap
msgid "B<min_refresh_delay>"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:38
+#: doc/apt-proxy.conf.5:37
msgid ""
"If different from B<off>, means that Packages and other control files will "
-"not be refreshed more frequently than this number of seconds\\&."
+"not be refreshed until they are at least this age."
msgstr ""
# type: TP
-#: doc/apt-proxy.conf.5:39 doc/apt-proxy.conf.5:103
+#: doc/apt-proxy.conf.5:38 doc/apt-proxy.conf.5:103
#, no-wrap
msgid "B<timeout>"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:44
+#: doc/apt-proxy.conf.5:43
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 "
@@ -324,24 +325,24 @@
msgstr ""
# type: TP
-#: doc/apt-proxy.conf.5:45
+#: doc/apt-proxy.conf.5:44
#, no-wrap
msgid "B<cache_dir>"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:48
+#: doc/apt-proxy.conf.5:47
msgid "Cache directory. Default: /var/cache/apt-proxy"
msgstr ""
# type: TP
-#: doc/apt-proxy.conf.5:49
+#: doc/apt-proxy.conf.5:48
#, no-wrap
msgid "B<cleanup_freq>"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:54
+#: doc/apt-proxy.conf.5:53
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 "
@@ -349,20 +350,20 @@
msgstr ""
# type: TP
-#: doc/apt-proxy.conf.5:55
+#: doc/apt-proxy.conf.5:54
#, no-wrap
msgid "B<max_age>"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:59
+#: doc/apt-proxy.conf.5:58
msgid ""
"If different from B<off>, indicates the maximum age of files before deletion "
"from the cache."
msgstr ""
# type: TP
-#: doc/apt-proxy.conf.5:60
+#: doc/apt-proxy.conf.5:59
#, no-wrap
msgid "B<max_versions>"
msgstr ""
@@ -374,7 +375,8 @@
"\\&.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."
+"the last 2 unstable versions. NOTE: If your system clock is very inaccurate "
+"this will not work properly and should be disabled."
msgstr ""
# type: TP
@@ -469,8 +471,7 @@
#: doc/apt-proxy.conf.5:107
#, no-wrap
msgid ""
-"B<backends = "
-">I<E<lt>protocolE<gt>>B<://>I<E<lt>serverE<gt>>B</>I<E<lt>directoryE<gt>>B< "
+"B<backends = E<lt>protocolE<gt>://E<lt>serverE<gt>/E<lt>directoryE<gt> "
"[...]>"
msgstr ""
@@ -519,14 +520,21 @@
"overriding the global http_proxy."
msgstr ""
+# type: Plain text
+#: doc/apt-proxy.conf.5:136
+msgid ""
+"Override the global min_refresh_delay for this backend. Set this to the "
+"interval at which this archive is usually refreshed."
+msgstr ""
+
# type: SH
-#: doc/apt-proxy.conf.5:132
+#: doc/apt-proxy.conf.5:137
#, no-wrap
msgid "CONFIGURATION EXAMPLES"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:137
+#: doc/apt-proxy.conf.5:142
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 "
@@ -534,17 +542,17 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:139
+#: doc/apt-proxy.conf.5:144
msgid "B<Debian main>"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:142
+#: doc/apt-proxy.conf.5:147
msgid "This example shows how to give clients access to the main Debian archive:"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:146
+#: doc/apt-proxy.conf.5:151
#, no-wrap
msgid ""
"[debian]\n"
@@ -553,25 +561,25 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:151
+#: doc/apt-proxy.conf.5:156
msgid "Using this configuration, the client would use a I<sources.list> entry like:"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:154
+#: doc/apt-proxy.conf.5:159
#, no-wrap
msgid " deb http://server:9999/debian woody main\n"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:159
+#: doc/apt-proxy.conf.5:164
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:162
+#: doc/apt-proxy.conf.5:167
#, no-wrap
msgid ""
" "
@@ -579,12 +587,12 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:165
+#: doc/apt-proxy.conf.5:170
msgid "and if that failed,"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:168
+#: doc/apt-proxy.conf.5:173
#, no-wrap
msgid ""
" "
@@ -592,12 +600,12 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:171
+#: doc/apt-proxy.conf.5:176
msgid "and apt-proxy will place the downloaded package in"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:173
+#: doc/apt-proxy.conf.5:178
#, no-wrap
msgid ""
" "
@@ -605,23 +613,23 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:176
+#: doc/apt-proxy.conf.5:181
msgid "B<backports.org>"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:178
+#: doc/apt-proxy.conf.5:183
msgid "The backports.org website tells you to use this I<sources.list> line:"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:181
+#: doc/apt-proxy.conf.5:186
#, no-wrap
msgid " deb http://www.backports.org/debian sarge-backports main\n"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:185
+#: doc/apt-proxy.conf.5:190
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 "
@@ -629,7 +637,7 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:189
+#: doc/apt-proxy.conf.5:194
#, no-wrap
msgid ""
" [backports]\n"
@@ -637,7 +645,7 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:194
+#: doc/apt-proxy.conf.5:199
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 "
@@ -645,46 +653,46 @@
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:197
+#: doc/apt-proxy.conf.5:202
#, no-wrap
msgid " deb http://proxy:9999/backports sarge-backports main\n"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:202
+#: doc/apt-proxy.conf.5:207
msgid ""
"For many more examples, see the supplied "
"/etc/apt-proxy/apt-proxy\\&.conf\\&."
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:205 doc/apt-proxy-v1tov2.8:20
+#: doc/apt-proxy.conf.5:210 doc/apt-proxy-v1tov2.8:20
msgid "/etc/apt-proxy/apt-proxy\\&.conf"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:207 doc/apt-proxy-v1tov2.8:22
+#: doc/apt-proxy.conf.5:212 doc/apt-proxy-v1tov2.8:22
msgid "/etc/apt-proxy/apt-proxy-v2\\&.conf"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:213
+#: doc/apt-proxy.conf.5:218
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:218
+#: doc/apt-proxy.conf.5:223
msgid "Plenty sure. Please report."
msgstr ""
# type: SH
-#: doc/apt-proxy.conf.5:219
+#: doc/apt-proxy.conf.5:224
#, no-wrap
msgid "AUTHOR"
msgstr ""
# type: Plain text
-#: doc/apt-proxy.conf.5:220
+#: doc/apt-proxy.conf.5:225
msgid ""
"apt-proxy v2 was written by Manuel Estrada Sainz "
"E<lt>ranty at debian.orgE<gt>\\&."
@@ -699,7 +707,7 @@
# type: TH
#: doc/apt-proxy-import.8:2
#, no-wrap
-msgid "February 2007"
+msgid "March 2008"
msgstr ""
# type: TH
Modified: branches/1.9.36/doc/po/fr.po
==============================================================================
--- branches/1.9.36/doc/po/fr.po (original)
+++ branches/1.9.36/doc/po/fr.po Tue Mar 25 12:46:14 2008
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-03 12:02+0100\n"
+"POT-Creation-Date: 2008-03-25 12:15+0000\n"
"PO-Revision-Date: 2007-01-27 16:21+0100\n"
"Last-Translator: Sylvain Archenault <sylvain.archenault at laposte.net>\n"
"Language-Team: French <French <debian-l10n-french at lists.debian.org>>\n"
@@ -50,7 +50,7 @@
# type: Plain text
#: doc/apt-proxy.8:8
msgid "B<apt-proxy> I<[options] [logfile]>"
-msgstr "B<apt-proxy> I<[options] [fichier de journalisation]>"
+msgstr "B< apt-proxy > I<[options] [fichier de journalisation]>"
# type: SH
#: doc/apt-proxy.8:10 doc/apt-proxy.conf.5:6 doc/apt-proxy-import.8:8
@@ -112,9 +112,8 @@
"to serve clients), like so:"
msgstr ""
"Une fois qu'B<apt-proxy> est configuré, les utilisateurs doivent éditer leur "
-"fichier B<sources.list> pour utiliser le serveur mandataire ou "
-"« proxy » (qui utilise le protocole HTTP pour servir les clients), comme "
-"suit :"
+"fichier B<sources.list> pour utiliser le serveur mandataire ou « proxy » (qui "
+"utilise le protocole HTTP pour servir les clients), comme suit :"
# type: Plain text
#: doc/apt-proxy.8:31
@@ -193,7 +192,7 @@
"mandataire (« proxy »)."
# type: SH
-#: doc/apt-proxy.8:56 doc/apt-proxy.conf.5:203 doc/apt-proxy-import.8:61
+#: doc/apt-proxy.8:56 doc/apt-proxy.conf.5:208 doc/apt-proxy-import.8:61
#: doc/apt-proxy-v1tov2.8:18
#, no-wrap
msgid "FILES"
@@ -205,7 +204,7 @@
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.conf.5:207 doc/apt-proxy-import.8:72
+#: doc/apt-proxy.8:61 doc/apt-proxy.conf.5:212 doc/apt-proxy-import.8:72
#: doc/apt-proxy-v1tov2.8:24
#, no-wrap
msgid "SEE ALSO"
@@ -217,7 +216,7 @@
msgstr "B<apt-proxy.conf>(5), B<apt-proxy-import>(8)"
# type: SH
-#: doc/apt-proxy.8:68 doc/apt-proxy.conf.5:216 doc/apt-proxy-import.8:63
+#: doc/apt-proxy.8:68 doc/apt-proxy.conf.5:221 doc/apt-proxy-import.8:63
#, no-wrap
msgid "BUGS"
msgstr "ANOMALIES"
@@ -352,29 +351,30 @@
msgstr "Le port TCP sur lequel apt-proxy sera à l'écoute des requêtes."
# type: TP
-#: doc/apt-proxy.conf.5:33
+#: doc/apt-proxy.conf.5:33 doc/apt-proxy.conf.5:132
#, no-wrap
msgid "B<min_refresh_delay>"
msgstr "B<min_refresh_delay>"
# type: Plain text
-#: doc/apt-proxy.conf.5:38
+#: doc/apt-proxy.conf.5:37
+#, fuzzy
msgid ""
"If different from B<off>, means that Packages and other control files will "
-"not be refreshed more frequently than this number of seconds\\&."
+"not be refreshed until they are at least this age."
msgstr ""
"S'il est 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:103
+#: doc/apt-proxy.conf.5:38 doc/apt-proxy.conf.5:103
#, no-wrap
msgid "B<timeout>"
msgstr "B<timeout>"
# type: Plain text
-#: doc/apt-proxy.conf.5:44
+#: doc/apt-proxy.conf.5:43
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 "
@@ -385,24 +385,24 @@
"essaiera le serveur suivant de la liste."
# type: TP
-#: doc/apt-proxy.conf.5:45
+#: doc/apt-proxy.conf.5:44
#, no-wrap
msgid "B<cache_dir>"
msgstr "B<cache_dir>"
# type: Plain text
-#: doc/apt-proxy.conf.5:48
+#: doc/apt-proxy.conf.5:47
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
+#: doc/apt-proxy.conf.5:48
#, no-wrap
msgid "B<cleanup_freq>"
msgstr "B<cleanup_freq>"
# type: Plain text
-#: doc/apt-proxy.conf.5:54
+#: doc/apt-proxy.conf.5:53
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 "
@@ -414,13 +414,13 @@
"etc."
# type: TP
-#: doc/apt-proxy.conf.5:55
+#: doc/apt-proxy.conf.5:54
#, no-wrap
msgid "B<max_age>"
msgstr "B<max_age>"
# type: Plain text
-#: doc/apt-proxy.conf.5:59
+#: doc/apt-proxy.conf.5:58
msgid ""
"If different from B<off>, indicates the maximum age of files before deletion "
"from the cache."
@@ -429,19 +429,21 @@
"leur effacement du cache."
# type: TP
-#: doc/apt-proxy.conf.5:60
+#: doc/apt-proxy.conf.5:59
#, no-wrap
msgid "B<max_versions>"
msgstr "B<max_versions>"
# type: Plain text
#: doc/apt-proxy.conf.5:67
+#, fuzzy
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."
+"unstable versions. NOTE: If your system clock is very inaccurate this will "
+"not work properly and should be disabled."
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. "
@@ -533,7 +535,7 @@
msgstr ""
"Limite la bande passante à I<valeur> octets par seconde lors du "
"téléchargement sur un serveur. Veuillez remarquer que ceci s'applique "
-"uniquement aux serveurs b<http> et B<rsync>. Par défaut : pas de limite."
+"uniquement aux serveurs B<http> et B<rsync>. Par défaut : pas de limite."
# type: SH
#: doc/apt-proxy.conf.5:99
@@ -558,8 +560,8 @@
# type: TP
#: doc/apt-proxy.conf.5:107
-#, no-wrap
-msgid "B<backends = >I<E<lt>protocolE<gt>>B<://>I<E<lt>serverE<gt>>B</>I<E<lt>directoryE<gt>>B< [...]>"
+#, fuzzy, no-wrap
+msgid "B<backends = E<lt>protocolE<gt>://E<lt>serverE<gt>/E<lt>directoryE<gt> [...]>"
msgstr "B<backends = >I<E<lt>protocoleE<gt>>B<://>I<E<lt>serveurE<gt>>B</>E<lt>répertoireE<gt>>B< [...]>"
# type: Plain text
@@ -615,14 +617,21 @@
"Indiquez B<[nom d'utilisateur:mot de passe@]nom d'hôte:port> pour utiliser "
"un proxy amont, ignorant le paramètre global http_proxy."
+# type: Plain text
+#: doc/apt-proxy.conf.5:136
+msgid ""
+"Override the global min_refresh_delay for this backend. Set this to the "
+"interval at which this archive is usually refreshed."
+msgstr ""
+
# type: SH
-#: doc/apt-proxy.conf.5:132
+#: doc/apt-proxy.conf.5:137
#, no-wrap
msgid "CONFIGURATION EXAMPLES"
msgstr "EXEMPLES DE CONFIGURATION"
# type: Plain text
-#: doc/apt-proxy.conf.5:137
+#: doc/apt-proxy.conf.5:142
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 "
@@ -633,12 +642,12 @@
"fin de la ligne du fichier /etc/apt/sources.list"
# type: TH
-#: doc/apt-proxy.conf.5:139
+#: doc/apt-proxy.conf.5:144
msgid "B<Debian main>"
msgstr "B<Debian main>"
# type: Plain text
-#: doc/apt-proxy.conf.5:142
+#: doc/apt-proxy.conf.5:147
msgid ""
"This example shows how to give clients access to the main Debian archive:"
msgstr ""
@@ -646,7 +655,7 @@
"principale :"
# type: Plain text
-#: doc/apt-proxy.conf.5:146
+#: doc/apt-proxy.conf.5:151
#, no-wrap
msgid ""
"[debian]\n"
@@ -658,7 +667,7 @@
" http://ftp.fr.debian.org/debian/\n"
# type: Plain text
-#: doc/apt-proxy.conf.5:151
+#: doc/apt-proxy.conf.5:156
msgid ""
"Using this configuration, the client would use a I<sources.list> entry like:"
msgstr ""
@@ -666,13 +675,13 @@
"list> comme ceci :"
# type: Plain text
-#: doc/apt-proxy.conf.5:154
+#: doc/apt-proxy.conf.5:159
#, 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:159
+#: doc/apt-proxy.conf.5:164
msgid ""
"And so the file request `/debian/woody/main/binary-i386/x11/foo_1-1.deb' "
"would turn into a backend request of first"
@@ -681,53 +690,53 @@
"deb » sera convertie en une demande d'abord de"
# type: Plain text
-#: doc/apt-proxy.conf.5:162
+#: doc/apt-proxy.conf.5:167
#, 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"
# type: Plain text
-#: doc/apt-proxy.conf.5:165
+#: doc/apt-proxy.conf.5:170
msgid "and if that failed,"
msgstr "et, en cas d'échec, de"
# type: Plain text
-#: doc/apt-proxy.conf.5:168
+#: doc/apt-proxy.conf.5:173
#, 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"
# type: Plain text
-#: doc/apt-proxy.conf.5:171
+#: doc/apt-proxy.conf.5:176
msgid "and apt-proxy will place the downloaded package in"
msgstr "et apt-proxy placera le paquet téléchargé dans"
# type: Plain text
-#: doc/apt-proxy.conf.5:173
+#: doc/apt-proxy.conf.5:178
#, 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:176
+#: doc/apt-proxy.conf.5:181
msgid "B<backports.org>"
msgstr "B<backports.org>"
# type: Plain text
-#: doc/apt-proxy.conf.5:178
+#: doc/apt-proxy.conf.5:183
msgid "The backports.org website tells you to use this I<sources.list> line:"
msgstr ""
"Le site backports.org indique qu'il faut utiliser dans I<sources.list> cette "
"ligne :"
# type: Plain text
-#: doc/apt-proxy.conf.5:181
+#: doc/apt-proxy.conf.5:186
#, no-wrap
msgid " deb http://www.backports.org/debian sarge-backports main\n"
msgstr " deb http://www.backports.org/debian sarge-backports main\n"
# type: Plain text
-#: doc/apt-proxy.conf.5:185
+#: doc/apt-proxy.conf.5:190
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:"
@@ -737,7 +746,7 @@
"pour l'URL :"
# type: Plain text
-#: doc/apt-proxy.conf.5:189
+#: doc/apt-proxy.conf.5:194
#, no-wrap
msgid ""
" [backports]\n"
@@ -747,7 +756,7 @@
" backends = http://www.backports.org/debian\n"
# type: Plain text
-#: doc/apt-proxy.conf.5:194
+#: doc/apt-proxy.conf.5:199
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 "
@@ -758,48 +767,48 @@
"l'hôte d'apt-proxy est I<proxy> et son port est 9999, vous devez écrire :"
# type: Plain text
-#: doc/apt-proxy.conf.5:197
+#: doc/apt-proxy.conf.5:202
#, no-wrap
msgid " deb http://proxy:9999/backports sarge-backports main\n"
msgstr " deb http://proxy:9999/backports sarge-backports main\n"
# type: Plain text
-#: doc/apt-proxy.conf.5:202
+#: doc/apt-proxy.conf.5:207
msgid ""
"For many more examples, see the supplied /etc/apt-proxy/apt-proxy\\&.conf\\&."
msgstr ""
"Pour d'autres exemples, voir le fichier /etc/apt-proxy/apt-proxy\\&.conf\\&."
# type: Plain text
-#: doc/apt-proxy.conf.5:205 doc/apt-proxy-v1tov2.8:20
+#: doc/apt-proxy.conf.5:210 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:207 doc/apt-proxy-v1tov2.8:22
+#: doc/apt-proxy.conf.5:212 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
+#: doc/apt-proxy.conf.5:218
msgid ""
"B<apt-proxy(8),> B</usr/share/doc/apt-proxy/README,> B<apt-proxy-import(8)>"
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:218
+#: doc/apt-proxy.conf.5:223
msgid "Plenty sure. Please report."
msgstr "Certainement. Veuillez nous en faire part."
# type: SH
-#: doc/apt-proxy.conf.5:219
+#: doc/apt-proxy.conf.5:224
#, no-wrap
msgid "AUTHOR"
msgstr "AUTEUR"
# type: Plain text
-#: doc/apt-proxy.conf.5:220
+#: doc/apt-proxy.conf.5:225
msgid ""
"apt-proxy v2 was written by Manuel Estrada Sainz E<lt>ranty at debian.orgE<gt>"
"\\&."
@@ -814,9 +823,9 @@
# type: TH
#: doc/apt-proxy-import.8:2
-#, no-wrap
-msgid "February 2007"
-msgstr "Février 2007"
+#, fuzzy, no-wrap
+msgid "March 2008"
+msgstr "mars 2006"
# type: TH
#: doc/apt-proxy-import.8:2 doc/apt-proxy-v1tov2.8:1
@@ -833,7 +842,7 @@
#: 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 journalisationL<gt> >..."
+"B< apt-proxy-import > [I< options >] I<E[fichier de journalisationL >..."
# type: Plain text
#: doc/apt-proxy-import.8:11
@@ -1096,12 +1105,12 @@
msgstr "Manuel Estrada Sainz E<lt>ranty at debian.orgE<gt>"
# type: TH
-#~ msgid " "
-#~ msgstr " "
+#~ msgid "February 2007"
+#~ msgstr "Février 2007"
# type: TH
-#~ msgid "March 2006"
-#~ msgstr "mars 2006"
+#~ msgid " "
+#~ msgstr " "
# type: Plain text
#~ msgid ""
More information about the apt-proxy-devel
mailing list