From 9f542bae2b3620887345ebc3e61970f8903123a0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 11 Dec 2009 00:32:01 +0100 Subject: add config setting for User-Agent in http and https to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) --- doc/apt.conf.5.xml | 7 ++++++- doc/examples/configure-index | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index e2db9defb..726bca2cc 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -275,7 +275,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; The used bandwidth can be limited with Acquire::http::Dl-Limit which accepts integer values in kilobyte. The default value is 0 which deactivates the limit and tries uses as much as possible of the bandwidth (Note that this option implicit - deactivates the download from multiple servers at the same time.) + deactivates the download from multiple servers at the same time.) + + Acquire::http::User-Agent can be used to set a different + User-Agent for the http download method as some proxies allow access for clients + only if the client uses a known identifier. + https diff --git a/doc/examples/configure-index b/doc/examples/configure-index index f5f996460..333c8df7e 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -191,6 +191,7 @@ Acquire Max-Age "86400"; // 1 Day age on index files No-Store "false"; // Prevent the cache from storing archives Dl-Limit "7"; // 7Kb/sec maximum download rate + User-Agent "Debian APT-HTTP/1.3"; }; // HTTPS method configuration: @@ -204,6 +205,8 @@ Acquire CaPath "/etc/ssl/certs"; Verify-Host" "true"; AllowRedirect "true"; + + User-Agent "Debian APT-CURL/1.0"; }; ftp -- cgit v1.2.3 From b9e9a44b3377cae2fb9aca3210f379ae1cb802ba Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 11 Dec 2009 00:38:13 +0100 Subject: add https options which default to the ones from http for the https method as this is more sane than using only the http options without a possibility to override these for https. --- doc/apt.conf.5.xml | 8 +++++--- doc/examples/configure-index | 33 ++++++++++++++++++++++++--------- 2 files changed, 29 insertions(+), 12 deletions(-) (limited to 'doc') diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 726bca2cc..d7ad51cfb 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -284,9 +284,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";}; https - HTTPS URIs. Cache-control and proxy options are the same as for - http method. - Pipeline-Depth option is not supported yet. + HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and + proxy options are the same as for http method and will also + default to the options from the http method if they are not + explicitly set for https. Pipeline-Depth option is not + supported yet. CaInfo suboption specifies place of file that holds info about trusted certificates. diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 333c8df7e..ced390447 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -194,19 +194,34 @@ Acquire User-Agent "Debian APT-HTTP/1.3"; }; - // HTTPS method configuration: - // - uses the http proxy config - // - uses the http cache-control values - // - uses the http Dl-Limit values - https + + + // HTTPS method configuration: uses the http + // - proxy config + // - cache-control values + // - Dl-Limit, Timout, ... values + // if not set explicit for https + // + // see /usr/share/doc/apt/examples/apt-https-method-example.conf.gz + // for more examples + https { Verify-Peer "false"; SslCert "/etc/apt/some.pem"; - CaPath "/etc/ssl/certs"; - Verify-Host" "true"; - AllowRedirect "true"; + CaPath "/etc/ssl/certs"; + Verify-Host" "true"; + AllowRedirect "true"; + + Timeout "120"; + AllowRedirect "true"; + + // Cache Control. Note these do not work with Squid 2.0.2 + No-Cache "false"; + Max-Age "86400"; // 1 Day age on index files + No-Store "false"; // Prevent the cache from storing archives + Dl-Limit "7"; // 7Kb/sec maximum download rate - User-Agent "Debian APT-CURL/1.0"; + User-Agent "Debian APT-CURL/1.0"; }; ftp -- cgit v1.2.3 From ca4907db7c8ec2d409a9ca32aeb2ccb4c3cd40aa Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 11 Dec 2009 00:48:52 +0100 Subject: fix a few typos in strings, comments and manpage of apt-ftparchive thanks Karl Goetz! (Closes: #558757) --- doc/apt-ftparchive.1.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index d47df957a..fb1b10adc 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -285,7 +285,7 @@ Sources - Sets the output Packages file. Defaults to + Sets the output Sources file. Defaults to $(DIST)/$(SECTION)/source/Sources -- cgit v1.2.3 From d4d9f5399244f5c7e698cc4860d1d9ab8f63992f Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Sat, 12 Dec 2009 14:51:16 +0100 Subject: French translation update --- doc/po/fr.po | 109 ++++++++++++++++++++++++++++------------------------------- 1 file changed, 51 insertions(+), 58 deletions(-) (limited to 'doc') diff --git a/doc/po/fr.po b/doc/po/fr.po index 49dc38f7f..324e883a2 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2009-11-27 00:05+0100\n" -"PO-Revision-Date: 2009-09-26 19:25+0200\n" +"POT-Creation-Date: 2009-12-01 19:13+0100\n" +"PO-Revision-Date: 2009-12-12 14:46+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -1080,7 +1080,7 @@ msgstr "" " \n" "\">\n" -#. The last update date +#. The last update date #. type: Content of: #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 #: apt-sortpkgs.1.xml:13 sources.list.5.xml:13 @@ -2601,8 +2601,7 @@ msgstr "" #. type: Content of: #: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 -msgid "" -"The option can be used to specify a binary caching DB." +msgid "The option can be used to specify a binary caching DB." msgstr "" "On peut se servir de l'option pour demander un cache " "binaire." @@ -2757,10 +2756,8 @@ msgstr "" #. type: Content of: #: apt-ftparchive.1.xml:155 -msgid "" -"The generate configuration has 4 separate sections, each described below." -msgstr "" -"Ce fichier de configuration possède quatre sections, décrites ci-dessous." +msgid "The generate configuration has 4 separate sections, each described below." +msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous." #. type: Content of: #: apt-ftparchive.1.xml:157 @@ -3626,7 +3623,7 @@ msgstr "" "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le " "nombre 100 en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-get.8.xml:13 msgid "" @@ -4020,7 +4017,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:259 -#, fuzzy msgid "" "Source packages are tracked separately from binary packages via <literal>deb-" "src</literal> type lines in the &sources-list; file. This means that you " @@ -4029,13 +4025,12 @@ msgid "" "none) source version than the one you have installed or could install." msgstr "" "Les paquets source sont gérés indépendamment des paquets binaires, via les " -"lignes de type <literal>deb-src</literal> dans le fichier &sources-list;. On " -"n'obtiendra probablement pas les mêmes sources que celles du paquet installé " -"ou celles du paquet qu'on pourrait installer." +"lignes de type <literal>deb-src</literal> dans le fichier &sources-list;. Il est donc nécessaire d'ajouter une telle ligne pour chaque dépôt pour lequel vous souhaitez " +"pouvoir obtenir les sources. Dans le cas contraite, vous risquez de ne pas obtenir les mêmes sources que celles du paquet installé " +"ou celles du paquet installable." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:266 -#, fuzzy msgid "" "If the <option>--compile</option> option is specified then the package will " "be compiled to a binary .deb using <command>dpkg-buildpackage</command>, if " @@ -4781,6 +4776,8 @@ msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" +"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " +"&file-statelists;" #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:570 @@ -4955,8 +4952,7 @@ msgstr "<filename>/etc/apt/trusted.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:141 msgid "Keyring of local trusted keys, new keys will be added here." -msgstr "" -"Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées." +msgstr "Trousseau de clés locales fiables : les nouvelles clés y seront ajoutées." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:144 @@ -4980,10 +4976,8 @@ msgstr "Trousseau des clés fiables de l'archive Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:152 -msgid "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" -msgstr "" -"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:153 @@ -4995,7 +4989,7 @@ msgstr "Trousseau des clés fiables supprimées de l'archive Debian." msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:13 #, fuzzy @@ -5006,8 +5000,8 @@ msgid "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " "August 2009</date>" msgstr "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 " -"Novembre 2007</date>" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " +"août 2009</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt-mark.8.xml:22 apt-mark.8.xml:29 @@ -5035,10 +5029,12 @@ msgid "" "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" "arg> <arg choice=\"plain\">showauto</arg> </group>" msgstr "" -"<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" -"f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"req" -"\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" " -"rep=\"repeat\"><replaceable>paquet</replaceable></arg>" +" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" +"f=<replaceable>FICHIER</replaceable></option></arg> <group choice=\"plain" +"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable></arg> </" +"arg> <arg choice=\"plain\">showauto</arg> </group>" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:53 @@ -5067,7 +5063,7 @@ msgid "" msgstr "" "Lorsque l'installation d'un paquet est demandée et que d'autres paquets dont " "il dépend sont installés, ces paquets sont marqués comme ayant été " -"automatiquement installés. De tels paquets sont supprimés dès que plus aucun " +"automatiquement installés. De tels paquets sont supprimés par <command>apt-get</command> ou <command>aptitude</command> dès que plus aucun " "paquet, installé manuellement, qui dépend d'eux ne subsiste sur le système." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@ -5105,7 +5101,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:81 msgid "showauto" -msgstr "" +msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:82 @@ -5118,26 +5114,23 @@ msgid "" "<literal>showauto</literal> is used to print a list of automatically " "installed packages with each package on a new line." msgstr "" -"Avec la commande <literal>autoremove</literal>, apt-get supprime les paquets " -"installés dans le but de satisfaire les dépendances d'un paquet donné et qui " -"ne sont plus nécessaires." +"<literal>showauto</literal>, affiche les paquets " +"installés manuellement, un par ligne." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:93 -#, fuzzy -#| msgid "<option>-f=<filename>FILENAME</filename></option>" -msgid "" -"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" -msgstr "<option>-f=<filename>FICHIER</filename></option>" +msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" +msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>" + #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:94 -#, fuzzy -#| msgid "<option>--file=<filename>FILENAME</filename></option>" msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" -msgstr "<option>--file=<filename>FICHIER</filename></option>" +msgstr "" +"<option>--file=<filename><replaceable>FICHIER</replaceable></filename></" +"option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:97 @@ -5153,7 +5146,7 @@ msgid "" "<filename>extended_status</filename> in the directory defined by the " "Configuration Item: <literal>Dir::State</literal>." msgstr "" -"Lire/écrire les statistiques sur les paquets depuis <filename>FICHIER</" +"Lire/écrire les statistiques sur les paquets depuis <filename><replaceable>FICHIER</replaceable></" "filename> au lieu de l'emplacement par défaut (<filename>extended_status</" "filename> dans le répertoire défini par l'option de configuration " "<literal>Dir::State</literal>." @@ -5193,7 +5186,7 @@ msgstr "Afficher la version du programme." #, fuzzy #| msgid "<filename>/etc/apt/preferences</filename>" msgid "<filename>/var/lib/apt/extended_states</filename>" -msgstr "<filename>/etc/apt/preferences</filename>" +msgstr "<filename>/var/lib/apt/extended_states</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:125 @@ -5202,13 +5195,15 @@ msgid "" "State</literal> sets the path to the <filename>extended_states</filename> " "file." msgstr "" +"Liste d'état des paquets auto-installés. L'élément de configuration <literal>Dir::" +"State</literal> définit le chemin d'accès au fichier <filename>extended_states</filename>." #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:134 #, fuzzy #| msgid "&apt-cache; &apt-conf;" msgid "&apt-get;,&aptitude;,&apt-conf;" -msgstr "&apt-cache; &apt-conf;" +msgstr "&apt-get;,&aptitude;,&apt-conf;" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:138 @@ -5626,7 +5621,7 @@ msgstr "" "<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 " "en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt.conf.5.xml:13 #, fuzzy @@ -5644,7 +5639,7 @@ msgstr "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Documentation d'origine de " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " -"&apt-product; <date>10 décembre 2008</date>" +"&apt-product; <date>18 septembre 2009</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt.conf.5.xml:28 apt.conf.5.xml:35 @@ -5739,7 +5734,9 @@ msgstr "" "literal> et <literal>*/</literal>, tout comme les commentaires C/C++. " "Chaque ligne est de la forme : <literal>APT::Get::Assume-Yes \"true\";</" "literal> Le point-virgule final est obligatoire et les guillemets sont " -"optionnels. On peut déclarer un nouveau champ d'action avec des accolades, " +"optionnels. La valeur doit tenir sur une seule ligne et il n'existe pas de fusion de chaînes. Elle ne doit pas comporter de guillemets . Le comportement du caractère " +"barre oblique inversée \"\\\" et les caractères utilisés avec séquence d'échappement dans ue valeur ne sont pas déterministes et devraient être évités. Le nom d'une option " +"peut contenir des caractères alphanumériques et « /-:._+ ». On peut déclarer un nouveau champ d'action avec des accolades, " "comme suit :" #. type: Content of: <refentry><refsect1><informalexample><programlisting> @@ -7179,7 +7176,7 @@ msgstr "" #. TODO: provide a #. motivating example, except I haven't a clue why you'd want -#. to do this. +#. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.conf.5.xml:674 msgid "" @@ -7215,8 +7212,7 @@ msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:704 msgid "Print information related to downloading packages using FTP." -msgstr "" -"Affiche les informations concernant le téléchargement de paquets par FTP." +msgstr "Affiche les informations concernant le téléchargement de paquets par FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:711 @@ -7226,8 +7222,7 @@ msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:715 msgid "Print information related to downloading packages using HTTP." -msgstr "" -"Affiche les informations concernant le téléchargement de paquets par HTTP." +msgstr "Affiche les informations concernant le téléchargement de paquets par HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:722 @@ -7604,13 +7599,13 @@ msgstr "" msgid "&file-aptconf;" msgstr "&apt-conf;" -#. ? reading apt.conf +#. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:1024 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" @@ -7752,8 +7747,7 @@ msgstr "une priorité égale à 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #: apt_preferences.5.xml:94 -msgid "" -"to the versions that are not installed and belong to the target release." +msgid "to the versions that are not installed and belong to the target release." msgstr "" "est affectée aux versions qui ne sont pas installées et qui appartiennent à " "la distribution par défaut." @@ -8238,8 +8232,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> #: apt_preferences.5.xml:306 msgid "Determination of Package Version and Distribution Properties" -msgstr "" -"Détermination de la version des paquets et des propriétés des distributions" +msgstr "Détermination de la version des paquets et des propriétés des distributions" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt_preferences.5.xml:308 -- cgit v1.2.3 From f8b832bdbe85ca315404edcf1159fb1225fddfbf Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 Dec 2009 16:32:18 +0100 Subject: remove informalexample tag which hides the programlisting in the tree section of the apt-ftparchive manpage, thanks Chris Leick for noticing it! --- doc/apt-ftparchive.1.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index fb1b10adc..c56ff235a 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -350,11 +350,11 @@ <para> When processing a <literal>Tree</literal> section <command>apt-ftparchive</command> performs an operation similar to: -<informalexample><programlisting> + <programlisting> for i in Sections do for j in Architectures do Generate for DIST=scope SECTION=i ARCH=j -</programlisting></informalexample></para> + </programlisting></para> <variablelist> <varlistentry><term>Sections</term> -- cgit v1.2.3 From 5d70f74c114450f001d415eea101610eedaee05b Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Sat, 12 Dec 2009 19:06:01 +0100 Subject: fix to other oddities observed by Chris Leick while translating in doc/apt-get.8.xml, namely: - change equivalent "for" to "to the" (purge command) - clarify --fix-broken sentence about specifying packages --- doc/apt-get.8.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index d3c3772bd..3d22f262c 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -333,8 +333,8 @@ <varlistentry><term><option>-f</option></term><term><option>--fix-broken</option></term> <listitem><para>Fix; attempt to correct a system with broken dependencies in place. This option, when used with install/remove, can omit any packages - to permit APT to deduce a likely solution. Any Package that are specified - must completely correct the problem. The option is sometimes necessary when + to permit APT to deduce a likely solution. If packages are specified, + these have to completely correct the problem. The option is sometimes necessary when running APT for the first time; APT itself does not allow broken package dependencies to exist on a system. It is possible that a system's dependency structure can be so corrupt as to require manual intervention @@ -466,7 +466,7 @@ <varlistentry><term><option>--purge</option></term> <listitem><para>Use purge instead of remove for anything that would be removed. An asterisk ("*") will be displayed next to packages which are - scheduled to be purged. <option>remove --purge</option> is equivalent for + scheduled to be purged. <option>remove --purge</option> is equivalent to the <option>purge</option> command. Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem> </varlistentry> -- cgit v1.2.3 From f124331728521aac777f284fcb451381899236ef Mon Sep 17 00:00:00 2001 From: David Kalnischkies <kalnischkies@gmail.com> Date: Mon, 14 Dec 2009 12:44:17 +0100 Subject: fix two other typos - this time in sources.list.5.xml: * recongnizable --> recognizable * maintain --> maintains --- doc/sources.list.5.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 0f788aca1..e2993db2c 100644 --- a/doc/sources.list.5.xml +++ b/doc/sources.list.5.xml @@ -175,11 +175,11 @@ deb http://http.us.debian.org/debian dists/stable-updates/ commands to perform the file transfers from the remote.</para></listitem> </varlistentry> - <varlistentry><term>more recongnizable URI types</term> + <varlistentry><term>more recognizable URI types</term> <listitem><para> APT can be extended with more methods shipped in other optional packages which should follow the nameing scheme <literal>apt-transport-<replaceable>method</replaceable></literal>. - The APT team e.g. maintain also the <literal>apt-transport-https</literal> package which + The APT team e.g. maintains also the <literal>apt-transport-https</literal> package which provides access methods for https-URIs with features similiar to the http method, but other methods for using e.g. debtorrent are also available, see <citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></refentrytitle> -- cgit v1.2.3 From d0cf6da810b2ad898c0eb75ac8815ab5e56cf015 Mon Sep 17 00:00:00 2001 From: "bubulle@debian.org" <> Date: Wed, 16 Dec 2009 23:00:06 +0100 Subject: French translation update --- doc/po/fr.po | 96 ++++++++++++++++++++++-------------------------------------- 1 file changed, 35 insertions(+), 61 deletions(-) (limited to 'doc') diff --git a/doc/po/fr.po b/doc/po/fr.po index 324e883a2..6aa64d20a 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: 2009-12-01 19:13+0100\n" -"PO-Revision-Date: 2009-12-12 14:46+0100\n" +"PO-Revision-Date: 2009-12-16 07:51+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -358,7 +358,7 @@ msgstr "" #. type: Plain text #: apt.ent:84 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| "<!ENTITY dpkg \"<citerefentry>\n" #| " <refentrytitle><command>dpkg</command></refentrytitle>\n" @@ -374,7 +374,7 @@ msgid "" msgstr "" "<!ENTITY dpkg \"<citerefentry>\n" " <refentrytitle><command>dpkg</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" @@ -412,7 +412,7 @@ msgstr "" #. type: Plain text #: apt.ent:102 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" #| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" @@ -428,13 +428,13 @@ msgid "" msgstr "" "<!ENTITY dpkg-scanpackages \"<citerefentry>\n" " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" #. type: Plain text #: apt.ent:108 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| "<!ENTITY dpkg-scansources \"<citerefentry>\n" #| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" @@ -450,13 +450,13 @@ msgid "" msgstr "" "<!ENTITY dpkg-scansources \"<citerefentry>\n" " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" #. type: Plain text #: apt.ent:114 -#, fuzzy, no-wrap +#, no-wrap #| msgid "" #| "<!ENTITY dselect \"<citerefentry>\n" #| " <refentrytitle><command>dselect</command></refentrytitle>\n" @@ -472,7 +472,7 @@ msgid "" msgstr "" "<!ENTITY dselect \"<citerefentry>\n" " <refentrytitle><command>dselect</command></refentrytitle>\n" -" <manvolnum>8</manvolnum>\n" +" <manvolnum>1</manvolnum>\n" " </citerefentry>\"\n" ">\n" @@ -1379,7 +1379,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:152 -#, fuzzy #| msgid "" #| "<literal>Missing</literal> is the number of package names that were " #| "referenced in a dependency but were not provided by any package. Missing " @@ -1397,7 +1396,7 @@ msgstr "" "dépendance mais qui ne sont fournis par aucun paquet. Les paquets manquants " "peuvent être mis en évidence quand on n'accède pas à une distribution " "complète ou si un paquet (réel ou virtuel) a été sorti d'une distribution. " -"Habituellement on les trouve dans les champs « Conflicts »." +"Habituellement on les trouve dans les champs « Conflicts » ou « Breaks »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:159 @@ -1585,7 +1584,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:234 -#, fuzzy #| msgid "" #| "Note that a package which APT knows of is not nessasarily available to " #| "download, installable or installed, e.g. virtual packages are also listed " @@ -1597,7 +1595,7 @@ msgid "" msgstr "" "Veuillez noter qu'un paquet connu par APT n'est pas forcément disponible, " "installable ou installé. Par exemple, les paquets virtuels sont également " -"affichés dans la liste." +"affichés dans la liste créée." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:239 @@ -2450,7 +2448,6 @@ msgstr "<option>--tempdir</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-extracttemplates.1.xml:62 -#, fuzzy #| msgid "" #| "Temporary directory in which to write extracted debconf template files " #| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::" @@ -2460,8 +2457,7 @@ msgid "" "config scripts. Configuration Item: <literal>APT::ExtractTemplates::" "TempDir</literal>" msgstr "" -"Répertoire temporaire dans lequel écrire les scripts et guides de " -"configuration pour Debconf. Élément de configuration : <literal>APT::" +"Répertoire temporaire dans lequel écrire les scripts de configuration et modèles d'écrans pour Debconf. Élément de configuration : <literal>APT::" "ExtractTemplates::TempDir</literal>." #. type: Content of: <refentry><refsect1><para> @@ -2473,19 +2469,16 @@ msgstr "" "<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, " "le nombre 100 en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-ftparchive.1.xml:13 -#, fuzzy #| msgid "" #| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 " #| "November 2007</date>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " "August 2009</date>" -msgstr "" -"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 " -"Novembre 2007</date>" +msgstr "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>17 août 2009</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29 @@ -2766,7 +2759,6 @@ msgstr "La section Dir" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt-ftparchive.1.xml:159 -#, fuzzy #| msgid "" #| "The <literal>Dir</literal> section defines the standard directories " #| "needed to locate the files required during the generation process. These " @@ -3578,10 +3570,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-ftparchive.1.xml:547 -#, fuzzy #| msgid "<option>--version</option>" msgid "<option>APT::FTPArchive::LongDescription</option>" -msgstr "<option>--version</option>" +msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 @@ -3592,6 +3583,10 @@ msgid "" "that it is currently not possible to create these files with <command>apt-" "ftparchive</command>." msgstr "" +"Cette option de configuration a « <literal>true</literal> » comme valeur par défaut et ne devrait être placée sur « <literal>false</literal> » que si l'archive créée avec " +"&apt-ftparchive; fournit également des fichiers <filename>Translation</filename>. Veuillez noter qu'il n'est actuellement pas possible de créer ces fichiers avec <command>" +"apt-" +"ftparchive</command>." #. type: Content of: <refentry><refsect1><title> #: apt-ftparchive.1.xml:561 apt.conf.5.xml:1011 apt_preferences.5.xml:462 @@ -3989,7 +3984,6 @@ msgstr "source" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:251 -#, fuzzy #| msgid "" #| "<literal>source</literal> causes <command>apt-get</command> to fetch " #| "source packages. APT will examine the available packages to decide which " @@ -4309,7 +4303,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:386 -#, fuzzy #| msgid "" #| "Simulation run as user will deactivate locking (<literal>Debug::" #| "NoLocking</literal>) automatical. Also a notice will be displayed " @@ -4337,7 +4330,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:392 -#, fuzzy #| msgid "" #| "Simulate prints out a series of lines each one representing a dpkg " #| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square " @@ -4992,7 +4984,6 @@ msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:13 -#, fuzzy #| msgid "" #| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 " #| "November 2007</date>" @@ -5015,7 +5006,6 @@ msgstr "marquer/démarquer un paquet comme ayant été installé automatiquement #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:36 -#, fuzzy #| msgid "" #| "<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" #| "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req" @@ -5047,7 +5037,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:57 -#, fuzzy #| msgid "" #| "When you request that a package is installed, and as a result other " #| "packages are installed to satisfy its dependencies, the dependencies are " @@ -5105,7 +5094,6 @@ msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:82 -#, fuzzy #| msgid "" #| "<literal>autoremove</literal> is used to remove packages that were " #| "automatically installed to satisfy dependencies for some package and that " @@ -5122,7 +5110,6 @@ msgstr "" msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:94 msgid "" @@ -5134,7 +5121,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:97 -#, fuzzy #| msgid "" #| "Read/Write package stats from <filename>FILENAME</filename> instead of " #| "the default location, which is <filename>extended_status</filename> in " @@ -5149,7 +5135,7 @@ msgstr "" "Lire/écrire les statistiques sur les paquets depuis <filename><replaceable>FICHIER</replaceable></" "filename> au lieu de l'emplacement par défaut (<filename>extended_status</" "filename> dans le répertoire défini par l'option de configuration " -"<literal>Dir::State</literal>." +"<literal>Dir::State</literal>)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:103 @@ -5183,7 +5169,6 @@ msgstr "Afficher la version du programme." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:124 -#, fuzzy #| msgid "<filename>/etc/apt/preferences</filename>" msgid "<filename>/var/lib/apt/extended_states</filename>" msgstr "<filename>/var/lib/apt/extended_states</filename>" @@ -5200,7 +5185,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:134 -#, fuzzy #| msgid "&apt-cache; &apt-conf;" msgid "&apt-get;,&aptitude;,&apt-conf;" msgstr "&apt-get;,&aptitude;,&apt-conf;" @@ -5269,7 +5253,6 @@ msgstr "Trusted archives" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:67 -#, fuzzy #| msgid "" #| "The chain of trust from an apt archive to the end user is made up of " #| "different steps. <command>apt-secure</command> is the last step in this " @@ -5325,7 +5308,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:92 -#, fuzzy #| msgid "" #| "Once the uploaded package is verified and included in the archive, the " #| "maintainer signature is stripped off, an MD5 sum of the package is " @@ -5342,11 +5324,11 @@ msgid "" "by the archive key (which is created once a year) and distributed through " "the FTP server. This key is also on the Debian keyring." msgstr "" -"Une fois le paquet vérifié et archivé, la signature du responsable est " +"Une fois que le paquet envoyé a été vérifié et inclus dans l'archive, la signature du responsable est " "enlevée, une somme MD5 du paquet est calculée et mise dans le fichier " "Packages. Une somme MD5 de tous les paquets est ensuite calculée et mise " "dans le fichier Release. Ce fichier est signé par la clé de l'archive. Cette " -"clé qui est créée chaque année et distribuée par le serveur FTP se trouve " +"clé, qui est recréée chaque année, est distribuée par le serveur FTP. Elle se trouve " "aussi dans le trousseau Debian." #. type: Content of: <refentry><refsect1><para> @@ -5462,7 +5444,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:160 -#, fuzzy #| msgid "" #| "<literal>Create a toplevel Release file</literal>. if it does not exist " #| "already. You can do this by running <command>apt-ftparchive release</" @@ -5472,13 +5453,12 @@ msgid "" "already. You can do this by running <command>apt-ftparchive release</" "command> (provided in apt-utils)." msgstr "" -"<literal>créer un fichier Release à la racine de l'archive</literal>, s'il " +"<emphasis>créer un fichier Release à la racine de l'archive</emphasis>, s'il " "n'existe pas déjà. Vous pouvez le créer avec la commande <command>apt-" -"ftparchive release</command> (fournie dans le paquet apt-utils) ;" +"ftparchive release</command> (fournie dans le paquet apt-utils)." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:165 -#, fuzzy #| msgid "" #| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -" #| "o Release.gpg Release</command>." @@ -5486,12 +5466,11 @@ msgid "" "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -" "o Release.gpg Release</command>." msgstr "" -"<literal>le signer</literal>, avec la commande <command>gpg -abs -o Release." -"gpg Release</command> ;" +"<emphasis>le signer</emphasis>, avec la commande <command>gpg -abs -o Release." +"gpg Release</command>." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:168 -#, fuzzy #| msgid "" #| "<literal>Publish the key fingerprint</literal>, that way your users will " #| "know what key they need to import in order to authenticate the files in " @@ -5501,7 +5480,7 @@ msgid "" "know what key they need to import in order to authenticate the files in the " "archive." msgstr "" -"<literal>publier l'empreinte de la clé</literal>. Ainsi les utilisateurs de " +"<emphasis>publier l'empreinte de la clé</emphasis>. Ainsi les utilisateurs de " "votre archive connaîtront la clé qu'ils doivent importer pour authentifier " "les fichiers de l'archive." @@ -5624,7 +5603,6 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt.conf.5.xml:13 -#, fuzzy #| msgid "" #| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" #| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " @@ -5683,7 +5661,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:50 -#, fuzzy #| msgid "" #| "The configuration file is organized in a tree with options organized into " #| "functional groups. option specification is given with a double colon " @@ -5705,7 +5682,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:56 -#, fuzzy #| msgid "" #| "Syntactically the configuration language is modeled after what the ISC " #| "tools such as bind and dhcp use. Lines starting with <literal>//</" @@ -5803,6 +5779,9 @@ msgid "" "list. If you specify a name you can override the option as every other " "option by reassigning a new value to the option." msgstr "" +"Les noms des éléments de configuration sont optionnels si une liste est définie, comme cela peut se voir avec l'exemple <literal>DPkg::Pre-Install-Pkgs</literal> précédent." +" Si vous n'indiquez pas de nom, une nouvelle entrée ajoutera une nouvelle option à la liste. Dans le cas contraire, l'option correspondante peut être remplacée, comme " +"toute autre option, en lui réaffectant une valeur." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:98 @@ -7198,8 +7177,7 @@ msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:693 -msgid "" -"Print information related to accessing <literal>cdrom://</literal> sources." +msgid "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "Affiche les informations concernant les sources de type <literal>cdrom://</" "literal>" @@ -7383,8 +7361,7 @@ msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:844 -msgid "" -"Log all interactions with the sub-processes that actually perform downloads." +msgid "Log all interactions with the sub-processes that actually perform downloads." msgstr "" "Affiche toutes les interactions avec les processus enfants qui se chargent " "effectivement des téléchargements." @@ -7525,8 +7502,7 @@ msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:945 -msgid "" -"Output status messages tracing the steps performed when invoking &dpkg;." +msgid "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@ -9361,8 +9337,7 @@ msgstr "" #. type: <abstract></abstract> #: guide.sgml:11 -msgid "" -"This document provides an overview of how to use the the APT package manager." +msgid "This document provides an overview of how to use the the APT package manager." msgstr "" #. type: <copyrightsummary></copyrightsummary> @@ -9966,8 +9941,7 @@ msgstr "" #. type: <p></p> #: guide.sgml:447 -msgid "" -"Finally, APT will print out a summary of all the changes that will occur." +msgid "Finally, APT will print out a summary of all the changes that will occur." msgstr "" #. type: <example></example> -- cgit v1.2.3