Salut, Merci d'avance pour vos relectures. Les pages générées sont en ligne : http://people.debian.org/~taffit/util-linux/ Amicalement David
diff --git a/diffutils/po4a/po/fr.po b/diffutils/po4a/po/fr.po
index d6cf375..39f9bc8 100644
--- a/diffutils/po4a/po/fr.po
+++ b/diffutils/po4a/po/fr.po
@@ -3,12 +3,13 @@
#
# Jade Alglave <jade.alglave@ens-lyon.org>
# Nicolas François <nicolas.francois@centraliens.net>, 2009-2010.
+# David Prévot <david@tilapin.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: diffutils manpages\n"
"POT-Creation-Date: 2011-10-31 21:49-0400\n"
-"PO-Revision-Date: 2011-11-01 09:56-0400\n"
-"Last-Translator: Nicolas François <nicolas.francois@centraliens.net>\n"
+"PO-Revision-Date: 2011-11-05 18:20-0400\n"
+"Last-Translator: David Prévot <david@tilapin.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
@@ -81,12 +82,16 @@ msgid ""
"The optional SKIP1 and SKIP2 specify the number of bytes to skip at the "
"beginning of each file (zero by default)."
msgstr ""
+"Les I<décal1> et I<décal2> facultatifs indiquent le nombre d'octets à sauter "
+"au début de chaque fichier (zéro par défaut)."
#. type: Plain text
#: C/man1/cmp.1:15 C/man1/diff.1:12 C/man1/diff3.1:12 C/man1/sdiff.1:12
msgid ""
"Mandatory arguments to long options are mandatory for short options too."
msgstr ""
+"Les paramètres obligatoires aux options longues sont aussi obligatoires aux "
+"options courtes."
#. type: TP
#: C/man1/cmp.1:15
@@ -154,7 +159,7 @@ msgstr "B<-s>, B<--quiet>, B<--silent>"
#. type: Plain text
#: C/man1/cmp.1:34
msgid "suppress all normal output"
-msgstr ""
+msgstr "Supprimer toute la sortie normale."
#. type: TP
#: C/man1/cmp.1:34 C/man1/diff.1:213 C/man1/diff3.1:54 C/man1/sdiff.1:63
@@ -165,7 +170,7 @@ msgstr "B<--help>"
#. type: Plain text
#: C/man1/cmp.1:37 C/man1/diff.1:216 C/man1/diff3.1:57 C/man1/sdiff.1:66
msgid "display this help and exit"
-msgstr ""
+msgstr "Afficher l'aide et quitter."
#. type: TP
#: C/man1/cmp.1:37 C/man1/diff.1:216 C/man1/diff3.1:57 C/man1/sdiff.1:66
@@ -175,10 +180,8 @@ msgstr "B<-v>, B<--version>"
#. type: Plain text
#: C/man1/cmp.1:40 C/man1/diff.1:219 C/man1/diff3.1:60 C/man1/sdiff.1:69
-#, fuzzy
-#| msgid "Output version info."
msgid "output version information and exit"
-msgstr "Afficher le nom et la version du logiciel."
+msgstr "Afficher les informations de version et quitter."
#. type: Plain text
#: C/man1/cmp.1:44
@@ -228,12 +231,15 @@ msgstr "Signalez toute anomalie à E<lt>I<bug-diffutils@gnu.org>E<gt>."
msgid ""
"GNU diffutils home page: E<lt>http://www.gnu.org/software/diffutils/E<gt>"
msgstr ""
+"Page d'accueil de GNU diffutils : E<lt>URL:I<http://www.gnu.org/software/";
+"diffutils/>E<gt>."
#. type: Plain text
#: C/man1/cmp.1:55 C/man1/diff.1:233 C/man1/diff3.1:81 C/man1/sdiff.1:80
-msgid ""
-"General help using GNU software: E<lt>URL:I<http://www.gnu.org/gethelp/>E<gt>"
+msgid "General help using GNU software: E<lt>http://www.gnu.org/gethelp/E<gt>"
msgstr ""
+"Aide globale pour l'utilisation de logiciels GNU : E<lt>URL:I<http://www.gnu.";
+"org/gethelp/>E<gt>"
#. type: SH
#: C/man1/cmp.1:55 C/man1/diff.1:233 C/man1/diff3.1:81 C/man1/sdiff.1:80
@@ -777,17 +783,20 @@ msgstr "B<--LTYPE-line-format=>I<LFMT>"
#. type: Plain text
#: C/man1/diff.1:138
msgid "format LTYPE input lines with LFMT"
-msgstr "afficher toutes les lignes LTYPE en entrée au format I<LFMT>."
+msgstr "Afficher toutes les lignes LTYPE en entrée au format I<LFMT>."
#. type: Plain text
#: C/man1/diff.1:140
msgid "These format options provide fine-grained control over the output"
msgstr ""
+"Ces options de format fournissent un contrôle fin de la sortie de B<diff>, "
+"généralisant B<-D>, B<--ifdef>."
+# NOTE: formatting error, translated in the previous string.
#. type: Plain text
#: C/man1/diff.1:142
msgid "of diff, generalizing B<-D>/--ifdef."
-msgstr ""
+msgstr " "
#. type: TP
#: C/man1/diff.1:142
@@ -798,7 +807,7 @@ msgstr "Les valeurs possibles de LTYPE sont\\ : B<old>, B<new> ou B<unchanged>."
#. type: Plain text
#: C/man1/diff.1:145
msgid "GTYPE is LTYPE or `changed'."
-msgstr "Les valeurs possibles de GTYPE sont\\ : B<LTYPE> ou I<changed>."
+msgstr "Les valeurs possibles de GTYPE sont\\ : B<LTYPE> ou B<changed>."
#. type: Plain text
#: C/man1/diff.1:147
@@ -814,7 +823,7 @@ msgstr "%E<lt>"
#. type: Plain text
#: C/man1/diff.1:150
msgid "lines from FILE1"
-msgstr "lignes de I<fichier1>"
+msgstr "pour marquer les lignes de I<fichier1> ;"
#. type: TP
#: C/man1/diff.1:150
@@ -825,7 +834,7 @@ msgstr "%E<gt>"
#. type: Plain text
#: C/man1/diff.1:153
msgid "lines from FILE2"
-msgstr "lignes de I<fichier2>"
+msgstr "pour marquer les lignes de I<fichier2> ;"
#. type: TP
#: C/man1/diff.1:153
@@ -836,7 +845,7 @@ msgstr "%="
#. type: Plain text
#: C/man1/diff.1:156
msgid "lines common to FILE1 and FILE2"
-msgstr "lignes communes à I<fichier1> et à I<fichier2>"
+msgstr "pour marquer les lignes communes à I<fichier1> et à I<fichier2> ;"
#. type: TP
#: C/man1/diff.1:156
@@ -847,7 +856,7 @@ msgstr "%[-][LARGEUR][.[PRÉC]]{doxX}I<lettre>"
#. type: Plain text
#: C/man1/diff.1:159
msgid "printf-style spec for LETTER"
-msgstr "spécification de type printf pour I<lettre>"
+msgstr "spécification de type printf pour I<lettre>."
#. type: Plain text
#: C/man1/diff.1:161
@@ -865,7 +874,7 @@ msgstr "F"
#. type: Plain text
#: C/man1/diff.1:164
msgid "first line number"
-msgstr "numéro de la première ligne"
+msgstr "numéro de la première ligne ;"
#. type: TP
#: C/man1/diff.1:164
@@ -876,7 +885,7 @@ msgstr "L"
#. type: Plain text
#: C/man1/diff.1:167
msgid "last line number"
-msgstr "numéro de la dernière ligne"
+msgstr "numéro de la dernière ligne ;"
#. type: TP
#: C/man1/diff.1:167
@@ -887,7 +896,7 @@ msgstr "N"
#. type: Plain text
#: C/man1/diff.1:170
msgid "number of lines = L-F+1"
-msgstr "nombre de lignes = L-F+1"
+msgstr "nombre de lignes = L-F+1 ;"
#. type: TP
#: C/man1/diff.1:170
@@ -898,7 +907,7 @@ msgstr "E"
#. type: Plain text
#: C/man1/diff.1:173
msgid "F-1"
-msgstr "F-1"
+msgstr "F-1 ;"
#. type: TP
#: C/man1/diff.1:173
@@ -909,7 +918,7 @@ msgstr "M"
#. type: Plain text
#: C/man1/diff.1:176
msgid "L+1"
-msgstr "L+1"
+msgstr "L+1 ;"
#. type: TP
#: C/man1/diff.1:176
@@ -920,7 +929,7 @@ msgstr "%(A=B?T:E)"
#. type: Plain text
#: C/man1/diff.1:179
msgid "if A equals B then T else E"
-msgstr ""
+msgstr "si A est égal à B alors T et sinon E."
#. type: Plain text
#: C/man1/diff.1:181
@@ -936,7 +945,7 @@ msgstr "%L"
#. type: Plain text
#: C/man1/diff.1:184
msgid "contents of line"
-msgstr "contenu de la ligne"
+msgstr "contenu de la ligne ;"
#. type: TP
#: C/man1/diff.1:184
@@ -947,7 +956,7 @@ msgstr "%l"
#. type: Plain text
#: C/man1/diff.1:187
msgid "contents of line, excluding any trailing newline"
-msgstr "contenu de la ligne, sans les retours à la ligne"
+msgstr "contenu de la ligne, sans les retours à la ligne ;"
#. type: TP
#: C/man1/diff.1:187
@@ -958,7 +967,7 @@ msgstr "%[-][LARGEUR][.[PRÉC]]{doxX}n"
#. type: Plain text
#: C/man1/diff.1:190
msgid "printf-style spec for input line number"
-msgstr "spécifications de type printf pour le numéro de ligne d'entrée"
+msgstr "spécifications de type printf pour le numéro de ligne d'entrée."
#. type: Plain text
#: C/man1/diff.1:192
@@ -985,7 +994,7 @@ msgstr "%c'C'"
#. type: Plain text
#: C/man1/diff.1:198
msgid "the single character C"
-msgstr "l'unique caractère C"
+msgstr "l'unique caractère C ;"
#. type: TP
#: C/man1/diff.1:198
@@ -996,7 +1005,7 @@ msgstr "%c'\\eOOO'"
#. type: Plain text
#: C/man1/diff.1:201
msgid "the character with octal code OOO"
-msgstr "le caractère dont le code octal est OOO"
+msgstr "le caractère dont le code octal est OOO ;"
#. type: TP
#: C/man1/diff.1:201
@@ -1007,7 +1016,7 @@ msgstr "C"
#. type: Plain text
#: C/man1/diff.1:204
msgid "the character C (other characters represent themselves)"
-msgstr ""
+msgstr "le caractère C (les autres caractères se représentent eux-mêmes)."
#. type: TP
#: C/man1/diff.1:204 C/man1/sdiff.1:54
@@ -1071,7 +1080,7 @@ msgstr ""
#. type: Plain text
#: C/man1/diff.1:241
msgid "wdiff(1), cmp(1), diff3(1), sdiff(1), patch(1)"
-msgstr "wdiff(1), cmp(1), diff3(1), sdiff(1), patch(1)"
+msgstr "B<wdiff>(1), B<cmp>(1), B<diff3>(1), B<sdiff>(1), B<patch>(1)"
#. type: Plain text
#: C/man1/diff.1:249
@@ -1122,13 +1131,11 @@ msgstr "Afficher tous les changements, en plaçant les conflits entre chevrons."
#. type: Plain text
#: C/man1/diff3.1:19
-#, fuzzy
-#| msgid "Output unmerged changes from OLDFILE to YOURFILE into MYFILE."
msgid ""
"output ed script incorporating changes from OLDFILE to YOURFILE into MYFILE"
msgstr ""
-"Afficher les changements non fusionnés entre I<ancienfichier> et "
-"I<autrefichier> dans I<monfichier>."
+"Afficher un script « ed » constitué des changements entre I<ancienfichier> "
+"et I<autrefichier> dans I<monfichier>."
#. type: TP
#: C/man1/diff3.1:19
@@ -1139,7 +1146,7 @@ msgstr "B<-E>, B<--show-overlap>"
#. type: Plain text
#: C/man1/diff3.1:22
msgid "like B<-e>, but bracket conflicts"
-msgstr ""
+msgstr "Comme B<-e>, mais en plaçant les conflits entre chevrons."
#. type: TP
#: C/man1/diff3.1:22
@@ -1149,10 +1156,8 @@ msgstr "B<-3>, B<--easy-only>"
#. type: Plain text
#: C/man1/diff3.1:25
-#, fuzzy
-#| msgid "Output unmerged nonoverlapping changes."
msgid "like B<-e>, but incorporate only nonoverlapping changes"
-msgstr "Afficher les changements redondants non fusionnés."
+msgstr "Comme B<-e>, mais en n'incorporant que les changements non redondants."
#. type: TP
#: C/man1/diff3.1:25
@@ -1162,10 +1167,8 @@ msgstr "B<-x>, B<--overlap-only>"
#. type: Plain text
#: C/man1/diff3.1:28
-#, fuzzy
-#| msgid "Output unmerged nonoverlapping changes."
msgid "like B<-e>, but incorporate only overlapping changes"
-msgstr "Afficher les changements redondants non fusionnés."
+msgstr "Comme B<-e>, mais en n'incorporant que les changements redondants."
#. type: TP
#: C/man1/diff3.1:28
@@ -1176,7 +1179,7 @@ msgstr "B<-X>"
#. type: Plain text
#: C/man1/diff3.1:31
msgid "like B<-x>, but bracket conflicts"
-msgstr ""
+msgstr "Comme B<-x>, mais en plaçant les conflits entre chevrons."
#. type: TP
#: C/man1/diff3.1:31
@@ -1200,6 +1203,8 @@ msgstr "B<-m>, B<--merge>"
msgid ""
"output actual merged file, according to B<-A> if no other options are given"
msgstr ""
+"Afficher les fichiers vraiment fusionnés, d'après B<-A> si aucune autre "
+"option n'est donnée."
#. type: TP
#: C/man1/diff3.1:47 C/man1/sdiff.1:60
@@ -1222,6 +1227,8 @@ msgstr "B<-L>, B<--label=>I<étiquette>"
#: C/man1/diff3.1:54
msgid "use LABEL instead of file name (can be repeated up to three times)"
msgstr ""
+"Utiliser I<étiquette> au lieu du nom de fichier (peut être répété jusqu'à "
+"trois fois)."
#. type: Plain text
#: C/man1/diff3.1:63
@@ -1229,6 +1236,8 @@ msgid ""
"The default output format is a somewhat human-readable representation of the "
"changes."
msgstr ""
+"Le format d'affichage par défaut est une représentation à peu près lisible "
+"des modifications."
#. type: Plain text
#: C/man1/diff3.1:66
@@ -1236,6 +1245,9 @@ msgid ""
"The B<-e>, B<-E>, B<-x>, B<-X> (and corresponding long) options cause an ed "
"script to be output instead of the default."
msgstr ""
+"Avec les options B<-e>, B<-E>, B<-x> et B<-X> (et les formes longues "
+"correspondantes) un script « ed » est affiché à la place de l'affichage par "
+"défaut."
#. type: Plain text
#: C/man1/diff3.1:70
@@ -1244,6 +1256,9 @@ msgid ""
"internally and output the actual merged file. For unusual input, this is "
"more robust than using ed."
msgstr ""
+"Enfin, avec l'option B<-m> (B<--merge>), B<diff3> fait la fusion en interne "
+"et affiche le fichier vraiment fusionné. Pour les entrées inhabituelles, "
+"c'est plus robuste que l'utilisation de « ed »."
#. type: Plain text
#: C/man1/diff3.1:73
@@ -1263,7 +1278,7 @@ msgstr "Écrit par Randy Smith."
#. type: Plain text
#: C/man1/diff3.1:89
msgid "cmp(1), diff(1), sdiff(1)"
-msgstr "cmp(1), diff(1), sdiff(1)"
+msgstr "B<cmp>(1), B<diff>(1), B<sdiff>(1)"
#. type: Plain text
#: C/man1/diff3.1:97
@@ -1300,10 +1315,8 @@ msgstr "B<sdiff> [I<option>] ... I<fichier1 fichier2>"
#. type: Plain text
#: C/man1/sdiff.1:10
-#, fuzzy
-#| msgid "Side-by-side merge of file differences."
msgid "Side-by-side merge of differences between FILE1 and FILE2."
-msgstr "Fusionner les différences entre les fichiers."
+msgstr "Fusionner les différences entre I<fichier1> et I<fichier2>."
#. type: TP
#: C/man1/sdiff.1:12
@@ -1381,7 +1394,7 @@ msgstr "Écrit par Thomas Lord."
#. type: Plain text
#: C/man1/sdiff.1:88
msgid "cmp(1), diff(1), diff3(1)"
-msgstr "cmp(1), diff(1), diff3(1)"
+msgstr "B<cmp>(1), B<diff>(1), B<diff3>(1)"
#. type: Plain text
#: C/man1/sdiff.1:96
# translation of diffutils manpages to french
# Copyright (C) 2010 Free Software Foundation, Inc.
#
# Jade Alglave <jade.alglave@ens-lyon.org>
# Nicolas François <nicolas.francois@centraliens.net>, 2009-2010.
# David Prévot <david@tilapin.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: diffutils manpages\n"
"POT-Creation-Date: 2011-10-31 21:49-0400\n"
"PO-Revision-Date: 2011-11-05 18:20-0400\n"
"Last-Translator: David Prévot <david@tilapin.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: TH
#: C/man1/cmp.1:2
#, no-wrap
msgid "CMP"
msgstr "CMP"
#. type: TH
#: C/man1/cmp.1:2 C/man1/diff.1:2 C/man1/diff3.1:2 C/man1/sdiff.1:2
#, no-wrap
msgid "September 2011"
msgstr "septembre 2011"
#. type: TH
#: C/man1/cmp.1:2 C/man1/diff.1:2 C/man1/diff3.1:2 C/man1/sdiff.1:2
#, no-wrap
msgid "diffutils 3.2"
msgstr "diffutils 3.2"
#. type: TH
#: C/man1/cmp.1:2 C/man1/diff.1:2 C/man1/diff3.1:2 C/man1/sdiff.1:2
#, no-wrap
msgid "User Commands"
msgstr "Commandes utilisateur"
#. type: SH
#: C/man1/cmp.1:3 C/man1/diff.1:3 C/man1/diff3.1:3 C/man1/sdiff.1:3
#, no-wrap
msgid "NAME"
msgstr "NOM"
#. type: Plain text
#: C/man1/cmp.1:5
msgid "cmp - compare two files byte by byte"
msgstr "cmp - Comparer deux fichiers octet par octet"
#. type: SH
#: C/man1/cmp.1:5 C/man1/diff.1:5 C/man1/diff3.1:5 C/man1/sdiff.1:5
#, no-wrap
msgid "SYNOPSIS"
msgstr "SYNOPSIS"
#. type: Plain text
#: C/man1/cmp.1:8
msgid "B<cmp> [I<OPTION>]... I<FILE1 >[I<FILE2 >[I<SKIP1 >[I<SKIP2>]]]"
msgstr ""
"B<cmp> [I<option>] ... I<fichier1> [I<fichier2> [I<décal1> [I<décal2>]]]"
#. type: SH
#: C/man1/cmp.1:8 C/man1/diff.1:8 C/man1/diff3.1:8 C/man1/sdiff.1:8
#, no-wrap
msgid "DESCRIPTION"
msgstr "DESCRIPTION"
#. type: Plain text
#: C/man1/cmp.1:10
msgid "Compare two files byte by byte."
msgstr "Comparer deux fichier octet par octet."
#. type: Plain text
#: C/man1/cmp.1:13
msgid ""
"The optional SKIP1 and SKIP2 specify the number of bytes to skip at the "
"beginning of each file (zero by default)."
msgstr ""
"Les I<décal1> et I<décal2> facultatifs indiquent le nombre d'octets à sauter "
"au début de chaque fichier (zéro par défaut)."
#. type: Plain text
#: C/man1/cmp.1:15 C/man1/diff.1:12 C/man1/diff3.1:12 C/man1/sdiff.1:12
msgid ""
"Mandatory arguments to long options are mandatory for short options too."
msgstr ""
"Les paramètres obligatoires aux options longues sont aussi obligatoires aux "
"options courtes."
#. type: TP
#: C/man1/cmp.1:15
#, no-wrap
msgid "B<-b>, B<--print-bytes>"
msgstr "B<-b>, B<--print-bytes>"
#. type: Plain text
#: C/man1/cmp.1:18
msgid "print differing bytes"
msgstr "Afficher les octets qui diffèrent."
#. type: TP
#: C/man1/cmp.1:18
#, no-wrap
msgid "B<-i>, B<--ignore-initial>=I<SKIP>"
msgstr "B<-i>, B<--ignore-initial=>I<décal>"
#. type: Plain text
#: C/man1/cmp.1:21
msgid "skip first SKIP bytes of both inputs"
msgstr "Sauter les I<décal> premiers octets des deux entrées."
#. type: TP
#: C/man1/cmp.1:21
#, no-wrap
msgid "B<-i>, B<--ignore-initial>=I<SKIP1>:SKIP2"
msgstr "B<-i>, B<--ignore-initial=>I<décal1>B<:>I<décal2>"
#. type: Plain text
#: C/man1/cmp.1:25
msgid "skip first SKIP1 bytes of FILE1 and first SKIP2 bytes of FILE2"
msgstr ""
"Sauter les I<décal1> premiers octets de I<fichier1> et les I<décal2> "
"premiers octets de I<fichier2>."
#. type: TP
#: C/man1/cmp.1:25
#, no-wrap
msgid "B<-l>, B<--verbose>"
msgstr "B<-l>, B<--verbose>"
#. type: Plain text
#: C/man1/cmp.1:28
msgid "output byte numbers and differing byte values"
msgstr "Afficher les numéros et les valeurs des octets qui différent."
#. type: TP
#: C/man1/cmp.1:28
#, no-wrap
msgid "B<-n>, B<--bytes>=I<LIMIT>"
msgstr "B<-n>, B<--bytes=>I<limite>"
#. type: Plain text
#: C/man1/cmp.1:31
msgid "compare at most LIMIT bytes"
msgstr "Comparer au plus I<limite> octets."
#. type: TP
#: C/man1/cmp.1:31
#, no-wrap
msgid "B<-s>, B<--quiet>, B<--silent>"
msgstr "B<-s>, B<--quiet>, B<--silent>"
#. type: Plain text
#: C/man1/cmp.1:34
msgid "suppress all normal output"
msgstr "Supprimer toute la sortie normale."
#. type: TP
#: C/man1/cmp.1:34 C/man1/diff.1:213 C/man1/diff3.1:54 C/man1/sdiff.1:63
#, no-wrap
msgid "B<--help>"
msgstr "B<--help>"
#. type: Plain text
#: C/man1/cmp.1:37 C/man1/diff.1:216 C/man1/diff3.1:57 C/man1/sdiff.1:66
msgid "display this help and exit"
msgstr "Afficher l'aide et quitter."
#. type: TP
#: C/man1/cmp.1:37 C/man1/diff.1:216 C/man1/diff3.1:57 C/man1/sdiff.1:66
#, no-wrap
msgid "B<-v>, B<--version>"
msgstr "B<-v>, B<--version>"
#. type: Plain text
#: C/man1/cmp.1:40 C/man1/diff.1:219 C/man1/diff3.1:60 C/man1/sdiff.1:69
msgid "output version information and exit"
msgstr "Afficher les informations de version et quitter."
#. type: Plain text
#: C/man1/cmp.1:44
msgid ""
"SKIP values may be followed by the following multiplicative suffixes: kB "
"1000, K 1024, MB 1,000,000, M 1,048,576, GB 1,000,000,000, G 1,073,741,824, "
"and so on for T, P, E, Z, Y."
msgstr ""
"Les valeurs I<décal> peuvent être suivies d'un suffixe multiplicateur\\ : kB "
"1000, K 1024, MB 1\\ 000\\ 000, M 1\\ 048\\ 576, GB 1\\ 000\\ 000\\ 000, G "
"1\\ 073\\ 741\\ 824 et de la même façon avec «\\ T, P, E, Z, Y\\ »."
#. type: Plain text
#: C/man1/cmp.1:47
msgid ""
"If a FILE is `-' or missing, read standard input. Exit status is 0 if "
"inputs are the same, 1 if different, 2 if trouble."
msgstr ""
"Si un I<fichier> vaut B<-> ou est omis, l'entrée standard est lue. Le code "
"de retour vaut B<0> si les entrées sont identiques, B<1> si elles diffèrent, "
"et B<2> en cas de problème."
#. type: SH
#: C/man1/cmp.1:47 C/man1/diff.1:224 C/man1/diff3.1:73 C/man1/sdiff.1:72
#, no-wrap
msgid "AUTHOR"
msgstr "AUTEUR"
#. type: Plain text
#: C/man1/cmp.1:49
msgid "Written by Torbjorn Granlund and David MacKenzie."
msgstr "Écrit par Torbjorn Granlund et David MacKenzie."
#. type: SH
#: C/man1/cmp.1:49 C/man1/diff.1:227 C/man1/diff3.1:75 C/man1/sdiff.1:74
#, no-wrap
msgid "REPORTING BUGS"
msgstr "SIGNALER LES BOGUES"
#. type: Plain text
#: C/man1/cmp.1:51 C/man1/diff.1:229 C/man1/diff3.1:77 C/man1/sdiff.1:76
msgid "Report bugs to: bug-diffutils@gnu.org"
msgstr "Signalez toute anomalie à E<lt>I<bug-diffutils@gnu.org>E<gt>."
#. type: Plain text
#: C/man1/cmp.1:53 C/man1/diff.1:231 C/man1/diff3.1:79 C/man1/sdiff.1:78
msgid ""
"GNU diffutils home page: E<lt>http://www.gnu.org/software/diffutils/E<gt>"
msgstr ""
"Page d'accueil de GNU diffutils : E<lt>URL:I<http://www.gnu.org/software/";
"diffutils/>E<gt>."
#. type: Plain text
#: C/man1/cmp.1:55 C/man1/diff.1:233 C/man1/diff3.1:81 C/man1/sdiff.1:80
msgid "General help using GNU software: E<lt>http://www.gnu.org/gethelp/E<gt>"
msgstr ""
"Aide globale pour l'utilisation de logiciels GNU : E<lt>URL:I<http://www.gnu.";
"org/gethelp/>E<gt>"
#. type: SH
#: C/man1/cmp.1:55 C/man1/diff.1:233 C/man1/diff3.1:81 C/man1/sdiff.1:80
#, no-wrap
msgid "COPYRIGHT"
msgstr "COPYRIGHT"
#. type: Plain text
#: C/man1/cmp.1:58 C/man1/diff.1:236 C/man1/diff3.1:84 C/man1/sdiff.1:83
msgid ""
"Copyright \\(co 2011 Free Software Foundation, Inc. License GPLv3+: GNU GPL "
"version 3 or later E<lt>http://gnu.org/licenses/gpl.htmlE<gt>."
msgstr ""
"Copyright \\(co 2011 Free Software Foundation, Inc. Licence GPLv3+ : la "
"licence GPL GNU version 3 ou ultérieure E<lt>URL:I<http://gnu.org/licenses/";
"gpl.html>E<gt>."
#. type: Plain text
#: C/man1/cmp.1:61 C/man1/diff.1:239 C/man1/diff3.1:87 C/man1/sdiff.1:86
msgid ""
"This is free software: you are free to change and redistribute it. There is "
"NO WARRANTY, to the extent permitted by law."
msgstr ""
"Ce programme est un logiciel libre. Vous pouvez le modifier et le "
"redistribuer. Il n'y a AUCUNE GARANTIE dans la mesure autorisée par la loi."
#. type: SH
#: C/man1/cmp.1:61 C/man1/diff.1:239 C/man1/diff3.1:87 C/man1/sdiff.1:86
#, no-wrap
msgid "SEE ALSO"
msgstr "VOIR AUSSI"
#. type: Plain text
#: C/man1/cmp.1:63
msgid "diff(1), diff3(1), sdiff(1)"
msgstr "B<diff>(1), B<diff3>(1), B<sdiff>(1)"
#. type: Plain text
#: C/man1/cmp.1:71
msgid ""
"The full documentation for B<cmp> is maintained as a Texinfo manual. If the "
"B<info> and B<cmp> programs are properly installed at your site, the command"
msgstr ""
"La documentation complète de B<cmp> est disponible dans un manuel Texinfo. "
"Si les programmes B<info> et B<cmp> sont correctement installés, la commande"
#. type: Plain text
#: C/man1/cmp.1:73
msgid "B<info cmp>"
msgstr "B<info cmp>"
# documentation complète de diff3 est maintenue comme un manuel Texinfo. Si les programmes info et man sont correctement installés, la commande type: Plain text
#. type: Plain text
#: C/man1/cmp.1:74 C/man1/diff.1:252 C/man1/diff3.1:100 C/man1/sdiff.1:99
msgid "should give you access to the complete manual."
msgstr "devrait vous donner accès au manuel complet (en anglais)."
#. type: TH
#: C/man1/diff.1:2
#, no-wrap
msgid "DIFF"
msgstr "DIFF"
#. type: Plain text
#: C/man1/diff.1:5
msgid "diff - compare files line by line"
msgstr "diff - Comparer des fichiers ligne à ligne"
#. type: Plain text
#: C/man1/diff.1:8
msgid "B<diff> [I<OPTION>]... I<FILES>"
msgstr "B<diff> [I<option>] ... I<fichiers>"
#. type: Plain text
#: C/man1/diff.1:10
msgid "Compare FILES line by line."
msgstr "Comparer les I<fichiers> ligne à ligne."
#. type: TP
#: C/man1/diff.1:12
#, no-wrap
msgid "B<--normal>"
msgstr "B<--normal>"
#. type: Plain text
#: C/man1/diff.1:15
msgid "output a normal diff (the default)"
msgstr "Afficher les différences au format normal (par défaut)."
#. type: TP
#: C/man1/diff.1:15
#, no-wrap
msgid "B<-q>, B<--brief>"
msgstr "B<-q>, B<--brief>"
#. type: Plain text
#: C/man1/diff.1:18
msgid "report only when files differ"
msgstr "Indiquer seulement si les fichiers diffèrent."
#. type: TP
#: C/man1/diff.1:18
#, no-wrap
msgid "B<-s>, B<--report-identical-files>"
msgstr "B<-s>, B<--report-identical-files>"
#. type: Plain text
#: C/man1/diff.1:21
msgid "report when two files are the same"
msgstr "Indiquer lorsque deux fichiers sont identiques."
#. type: TP
#: C/man1/diff.1:21
#, no-wrap
msgid "B<-c>, B<-C> NUM, B<--context>[=I<NUM>]"
msgstr "B<-c>, B<-C> I<n>, B<--context>[B<=>I<n>]"
#. type: Plain text
#: C/man1/diff.1:24
msgid "output NUM (default 3) lines of copied context"
msgstr "Afficher I<n> lignes de contexte (3\\ lignes par défaut)."
#. type: TP
#: C/man1/diff.1:24
#, no-wrap
msgid "B<-u>, B<-U> NUM, B<--unified>[=I<NUM>]"
msgstr "B<-u>, B<-U> I<n>, B<--unified>[B<=>I<n>]"
#. type: Plain text
#: C/man1/diff.1:27
msgid "output NUM (default 3) lines of unified context"
msgstr "Afficher I<n> lignes de contexte unifié (3\\ lignes par défaut)."
#. type: TP
#: C/man1/diff.1:27 C/man1/diff3.1:15
#, no-wrap
msgid "B<-e>, B<--ed>"
msgstr "B<-e>, B<--ed>"
#. type: Plain text
#: C/man1/diff.1:30
msgid "output an ed script"
msgstr "Sortir un script «\\ ed\\ » valide."
#. type: TP
#: C/man1/diff.1:30
#, no-wrap
msgid "B<-n>, B<--rcs>"
msgstr "B<-n>, B<--rcs>"
#. type: Plain text
#: C/man1/diff.1:33
msgid "output an RCS format diff"
msgstr "Afficher les différences au format RCS."
#. type: TP
#: C/man1/diff.1:33
#, no-wrap
msgid "B<-y>, B<--side-by-side>"
msgstr "B<-y>, B<--side-by-side>"
#. type: Plain text
#: C/man1/diff.1:36
msgid "output in two columns"
msgstr "Afficher en deux colonnes."
#. type: TP
#: C/man1/diff.1:36
#, no-wrap
msgid "B<-W>, B<--width>=I<NUM>"
msgstr "B<-W>, B<--width=>I<n>"
#. type: Plain text
#: C/man1/diff.1:39 C/man1/sdiff.1:42
msgid "output at most NUM (default 130) print columns"
msgstr "Afficher au plus I<n> caractères par ligne (130 par défaut)."
#. type: TP
#: C/man1/diff.1:39
#, no-wrap
msgid "B<--left-column>"
msgstr "B<--left-column>"
#. type: Plain text
#: C/man1/diff.1:42 C/man1/sdiff.1:45
msgid "output only the left column of common lines"
msgstr "N'afficher que la colonne de gauche des lignes communes."
#. type: TP
#: C/man1/diff.1:42
#, no-wrap
msgid "B<--suppress-common-lines>"
msgstr "B<--suppress-common-lines>"
#. type: Plain text
#: C/man1/diff.1:45 C/man1/sdiff.1:48
msgid "do not output common lines"
msgstr "Ne pas afficher les lignes communes."
#. type: TP
#: C/man1/diff.1:45
#, no-wrap
msgid "B<-p>, B<--show-c-function>"
msgstr "B<-p>, B<--show-c-function>"
#. type: Plain text
#: C/man1/diff.1:48
msgid "show which C function each change is in"
msgstr "Indiquer dans quelle fonction C se trouve chaque changement."
#. type: TP
#: C/man1/diff.1:48
#, no-wrap
msgid "B<-F>, B<--show-function-line>=I<RE>"
msgstr "B<-F>, B<--show-function-line=>I<er>"
#. type: Plain text
#: C/man1/diff.1:51
msgid "show the most recent line matching RE"
msgstr "Afficher la ligne la plus récente correspondant à I<er>."
#. type: TP
#: C/man1/diff.1:51
#, no-wrap
msgid "B<--label> LABEL"
msgstr "B<--label> I<étiquette>"
#. type: Plain text
#: C/man1/diff.1:55
msgid "use LABEL instead of file name (can be repeated)"
msgstr "Utiliser I<étiquette> au lieu du nom de fichier (peut être répété)."
#. type: TP
#: C/man1/diff.1:55 C/man1/sdiff.1:48
#, no-wrap
msgid "B<-t>, B<--expand-tabs>"
msgstr "B<-t>, B<--expand-tabs>"
#. type: Plain text
#: C/man1/diff.1:58 C/man1/sdiff.1:51
msgid "expand tabs to spaces in output"
msgstr "Transformer les tabulations en espaces en sortie."
#. type: TP
#: C/man1/diff.1:58 C/man1/diff3.1:44
#, no-wrap
msgid "B<-T>, B<--initial-tab>"
msgstr "B<-T>, B<--initial-tab>"
#. type: Plain text
#: C/man1/diff.1:61 C/man1/diff3.1:47
msgid "make tabs line up by prepending a tab"
msgstr "Afficher une tabulation plutôt qu'une espace avant le texte."
#. type: TP
#: C/man1/diff.1:61 C/man1/sdiff.1:51
#, no-wrap
msgid "B<--tabsize>=I<NUM>"
msgstr "B<--tabsize=>I<n>"
#. type: Plain text
#: C/man1/diff.1:64
msgid "tab stops every NUM (default 8) print columns"
msgstr "Les tabulations s'arrêtent toutes les I<n> (8 par défaut) colonnes."
#. type: TP
#: C/man1/diff.1:64
#, no-wrap
msgid "B<--suppress-blank-empty>"
msgstr "B<--suppress-blank-empty>"
#. type: Plain text
#: C/man1/diff.1:67
msgid "suppress space or tab before empty output lines"
msgstr ""
"Supprimer les espaces ou tabulations avant les lignes de sorties vides."
#. type: TP
#: C/man1/diff.1:67
#, no-wrap
msgid "B<-l>, B<--paginate>"
msgstr "B<-l>, B<--paginate>"
#. type: Plain text
#: C/man1/diff.1:70
msgid "pass output through `pr' to paginate it"
msgstr "Envoyer la sortie à «\\ pr\\ » pour la paginer."
#. type: TP
#: C/man1/diff.1:70
#, no-wrap
msgid "B<-r>, B<--recursive>"
msgstr "B<-r>, B<--recursive>"
#. type: Plain text
#: C/man1/diff.1:73
msgid "recursively compare any subdirectories found"
msgstr "Comparer récursivement tous les sous-répertoires trouvés."
#. type: TP
#: C/man1/diff.1:73
#, no-wrap
msgid "B<-N>, B<--new-file>"
msgstr "B<-N>, B<--new-file>"
#. type: Plain text
#: C/man1/diff.1:76
msgid "treat absent files as empty"
msgstr "Considérer les fichiers absents comme des fichiers vides."
#. type: TP
#: C/man1/diff.1:76
#, no-wrap
msgid "B<--unidirectional-new-file>"
msgstr "B<--unidirectional-new-file>"
#. type: Plain text
#: C/man1/diff.1:79
msgid "treat absent first files as empty"
msgstr "Considérer les premiers fichiers manquants comme des fichiers vides."
#. type: TP
#: C/man1/diff.1:79
#, no-wrap
msgid "B<--ignore-file-name-case>"
msgstr "B<--ignore-file-name-case>"
#. type: Plain text
#: C/man1/diff.1:82
msgid "ignore case when comparing file names"
msgstr ""
"Ignorer les différences entre majuscules et minuscules pour la comparaison "
"des noms de fichier."
#. type: TP
#: C/man1/diff.1:82
#, no-wrap
msgid "B<--no-ignore-file-name-case>"
msgstr "B<--no-ignore-file-name-case>"
#. type: Plain text
#: C/man1/diff.1:85
msgid "consider case when comparing file names"
msgstr ""
"Tenir compte des différences entre majuscules et minuscules pour la "
"comparaison des noms de fichier."
#. type: TP
#: C/man1/diff.1:85
#, no-wrap
msgid "B<-x>, B<--exclude>=I<PAT>"
msgstr "B<-x>, B<--exclude=>I<motif>"
#. type: Plain text
#: C/man1/diff.1:88
msgid "exclude files that match PAT"
msgstr "Ignorer les fichiers qui correspondent au I<motif>."
#. type: TP
#: C/man1/diff.1:88
#, no-wrap
msgid "B<-X>, B<--exclude-from>=I<FILE>"
msgstr "B<-X>, B<--exclude-from=>I<fichier>"
#. type: Plain text
#: C/man1/diff.1:91
msgid "exclude files that match any pattern in FILE"
msgstr ""
"Ignorer les fichiers qui contiennent n'importe quel motif de I<fichier>."
#. type: TP
#: C/man1/diff.1:91
#, no-wrap
msgid "B<-S>, B<--starting-file>=I<FILE>"
msgstr "B<-S>, B<--starting-file=>I<fichier>"
#. type: Plain text
#: C/man1/diff.1:94
msgid "start with FILE when comparing directories"
msgstr "Commencer par I<fichier> lors de la comparaison de répertoires."
#. type: TP
#: C/man1/diff.1:94
#, no-wrap
msgid "B<--from-file>=I<FILE1>"
msgstr "B<--from-file=>I<fichier1>"
#. type: Plain text
#: C/man1/diff.1:98
msgid "compare FILE1 to all operands; FILE1 can be a directory"
msgstr ""
"Comparer I<fichier1> à tous les paramètres. I<fichier1> peut être un "
"répertoire."
#. type: TP
#: C/man1/diff.1:98
#, no-wrap
msgid "B<--to-file>=I<FILE2>"
msgstr "B<--to-file=>I<fichier2>"
#. type: Plain text
#: C/man1/diff.1:102
msgid "compare all operands to FILE2; FILE2 can be a directory"
msgstr ""
"Comparer I<fichier2> à tous les paramètres. I<fichier2> peut être un "
"répertoire."
#. type: TP
#: C/man1/diff.1:102 C/man1/sdiff.1:15
#, no-wrap
msgid "B<-i>, B<--ignore-case>"
msgstr "B<-i>, B<--ignore-case>"
#. type: Plain text
#: C/man1/diff.1:105
msgid "ignore case differences in file contents"
msgstr "Ignorer les différences entre majuscules et minuscules."
#. type: TP
#: C/man1/diff.1:105 C/man1/sdiff.1:18
#, no-wrap
msgid "B<-E>, B<--ignore-tab-expansion>"
msgstr "B<-E>, B<--ignore-tab-expansion>"
#. type: Plain text
#: C/man1/diff.1:108 C/man1/sdiff.1:21
msgid "ignore changes due to tab expansion"
msgstr "Ne pas tenir compte du développement des tabulations."
#. type: TP
#: C/man1/diff.1:108 C/man1/sdiff.1:21
#, no-wrap
msgid "B<-b>, B<--ignore-space-change>"
msgstr "B<-b>, B<--ignore-space-change>"
#. type: Plain text
#: C/man1/diff.1:111 C/man1/sdiff.1:24
msgid "ignore changes in the amount of white space"
msgstr "Ne pas tenir compte du nombre d'espaces blancs."
#. type: TP
#: C/man1/diff.1:111
#, no-wrap
msgid "B<-w>, B<--ignore-all-space>"
msgstr "B<-w>, B<--ignore-all-space>"
#. type: Plain text
#: C/man1/diff.1:114 C/man1/sdiff.1:27
msgid "ignore all white space"
msgstr "Ne tenir compte d'aucun espace blanc."
#. type: TP
#: C/man1/diff.1:114 C/man1/sdiff.1:27
#, no-wrap
msgid "B<-B>, B<--ignore-blank-lines>"
msgstr "B<-B>, B<--ignore-blank-lines>"
#. type: Plain text
#: C/man1/diff.1:117 C/man1/sdiff.1:30
msgid "ignore changes whose lines are all blank"
msgstr "Ne pas tenir compte des lignes vides."
#. type: TP
#: C/man1/diff.1:117 C/man1/sdiff.1:30
#, no-wrap
msgid "B<-I>, B<--ignore-matching-lines>=I<RE>"
msgstr "B<-I>, B<--ignore-matching-lines=>I<er>"
#. type: Plain text
#: C/man1/diff.1:120 C/man1/sdiff.1:33
msgid "ignore changes whose lines all match RE"
msgstr ""
"Ne pas tenir compte des changements sur les lignes qui correspondent à "
"l'expression rationnelle I<er>."
#. type: TP
#: C/man1/diff.1:120 C/man1/diff3.1:38 C/man1/sdiff.1:36
#, no-wrap
msgid "B<-a>, B<--text>"
msgstr "B<-a>, B<--text>"
#. type: Plain text
#: C/man1/diff.1:123 C/man1/diff3.1:41 C/man1/sdiff.1:39
msgid "treat all files as text"
msgstr "Traiter tous les fichiers comme du texte."
#. type: TP
#: C/man1/diff.1:123 C/man1/diff3.1:41 C/man1/sdiff.1:33
#, no-wrap
msgid "B<--strip-trailing-cr>"
msgstr "B<--strip-trailing-cr>"
#. type: Plain text
#: C/man1/diff.1:126 C/man1/diff3.1:44 C/man1/sdiff.1:36
msgid "strip trailing carriage return on input"
msgstr "Ignorer les retours à la ligne sur l'entrée standard."
#. type: TP
#: C/man1/diff.1:126
#, no-wrap
msgid "B<-D>, B<--ifdef>=I<NAME>"
msgstr "B<-D>, B<--ifdef=>I<nom>"
#. type: Plain text
#: C/man1/diff.1:129
msgid "output merged file with `#ifdef NAME' diffs"
msgstr ""
"Afficher un fichier fusionné pour montrer les différences sous la forme «\\ "
"#ifdef I<nom>\\ »."
#. type: TP
#: C/man1/diff.1:129
#, no-wrap
msgid "B<--GTYPE-group-format>=I<GFMT>"
msgstr "B<--GTYPE-group-format=>I<GFMT>"
#. type: Plain text
#: C/man1/diff.1:132
msgid "format GTYPE input groups with GFMT"
msgstr ""
"Similaire, mais afficher toutes les groupes GTYPE en entrée au format "
"I<GFMT>."
#. type: TP
#: C/man1/diff.1:132
#, no-wrap
msgid "B<--line-format>=I<LFMT>"
msgstr "B<--line-format=>I<LFMT>"
#. type: Plain text
#: C/man1/diff.1:135
msgid "format all input lines with LFMT"
msgstr "Afficher toutes les lignes en entrée au format I<LFMT>."
#. type: TP
#: C/man1/diff.1:135
#, no-wrap
msgid "B<--LTYPE-line-format>=I<LFMT>"
msgstr "B<--LTYPE-line-format=>I<LFMT>"
#. type: Plain text
#: C/man1/diff.1:138
msgid "format LTYPE input lines with LFMT"
msgstr "Afficher toutes les lignes LTYPE en entrée au format I<LFMT>."
#. type: Plain text
#: C/man1/diff.1:140
msgid "These format options provide fine-grained control over the output"
msgstr ""
"Ces options de format fournissent un contrôle fin de la sortie de B<diff>, "
"généralisant B<-D>, B<--ifdef>."
# NOTE: formatting error, translated in the previous string.
#. type: Plain text
#: C/man1/diff.1:142
msgid "of diff, generalizing B<-D>/--ifdef."
msgstr " "
#. type: TP
#: C/man1/diff.1:142
#, no-wrap
msgid "LTYPE is `old', `new', or `unchanged'."
msgstr "Les valeurs possibles de LTYPE sont\\ : B<old>, B<new> ou B<unchanged>."
#. type: Plain text
#: C/man1/diff.1:145
msgid "GTYPE is LTYPE or `changed'."
msgstr "Les valeurs possibles de GTYPE sont\\ : B<LTYPE> ou B<changed>."
#. type: Plain text
#: C/man1/diff.1:147
msgid "GFMT (only) may contain:"
msgstr "I<GFMT> (seul) peut contenir\\ :"
#. type: TP
#: C/man1/diff.1:147
#, no-wrap
msgid "%E<lt>"
msgstr "%E<lt>"
#. type: Plain text
#: C/man1/diff.1:150
msgid "lines from FILE1"
msgstr "pour marquer les lignes de I<fichier1> ;"
#. type: TP
#: C/man1/diff.1:150
#, no-wrap
msgid "%E<gt>"
msgstr "%E<gt>"
#. type: Plain text
#: C/man1/diff.1:153
msgid "lines from FILE2"
msgstr "pour marquer les lignes de I<fichier2> ;"
#. type: TP
#: C/man1/diff.1:153
#, no-wrap
msgid "%="
msgstr "%="
#. type: Plain text
#: C/man1/diff.1:156
msgid "lines common to FILE1 and FILE2"
msgstr "pour marquer les lignes communes à I<fichier1> et à I<fichier2> ;"
#. type: TP
#: C/man1/diff.1:156
#, no-wrap
msgid "%[-][WIDTH][.[PREC]]{doxX}LETTER"
msgstr "%[-][LARGEUR][.[PRÉC]]{doxX}I<lettre>"
#. type: Plain text
#: C/man1/diff.1:159
msgid "printf-style spec for LETTER"
msgstr "spécification de type printf pour I<lettre>."
#. type: Plain text
#: C/man1/diff.1:161
msgid "LETTERs are as follows for new group, lower case for old group:"
msgstr ""
"Les I<lettre>s sont comme suit pour le nouveau groupe, et en minuscules pour "
"l'ancien groupe\\ :"
#. type: TP
#: C/man1/diff.1:161
#, no-wrap
msgid "F"
msgstr "F"
#. type: Plain text
#: C/man1/diff.1:164
msgid "first line number"
msgstr "numéro de la première ligne ;"
#. type: TP
#: C/man1/diff.1:164
#, no-wrap
msgid "L"
msgstr "L"
#. type: Plain text
#: C/man1/diff.1:167
msgid "last line number"
msgstr "numéro de la dernière ligne ;"
#. type: TP
#: C/man1/diff.1:167
#, no-wrap
msgid "N"
msgstr "N"
#. type: Plain text
#: C/man1/diff.1:170
msgid "number of lines = L-F+1"
msgstr "nombre de lignes = L-F+1 ;"
#. type: TP
#: C/man1/diff.1:170
#, no-wrap
msgid "E"
msgstr "E"
#. type: Plain text
#: C/man1/diff.1:173
msgid "F-1"
msgstr "F-1 ;"
#. type: TP
#: C/man1/diff.1:173
#, no-wrap
msgid "M"
msgstr "M"
#. type: Plain text
#: C/man1/diff.1:176
msgid "L+1"
msgstr "L+1 ;"
#. type: TP
#: C/man1/diff.1:176
#, no-wrap
msgid "%(A=B?T:E)"
msgstr "%(A=B?T:E)"
#. type: Plain text
#: C/man1/diff.1:179
msgid "if A equals B then T else E"
msgstr "si A est égal à B alors T et sinon E."
#. type: Plain text
#: C/man1/diff.1:181
msgid "LFMT (only) may contain:"
msgstr "I<LFMT> (seul) peut contenir\\ :"
#. type: TP
#: C/man1/diff.1:181
#, no-wrap
msgid "%L"
msgstr "%L"
#. type: Plain text
#: C/man1/diff.1:184
msgid "contents of line"
msgstr "contenu de la ligne ;"
#. type: TP
#: C/man1/diff.1:184
#, no-wrap
msgid "%l"
msgstr "%l"
#. type: Plain text
#: C/man1/diff.1:187
msgid "contents of line, excluding any trailing newline"
msgstr "contenu de la ligne, sans les retours à la ligne ;"
#. type: TP
#: C/man1/diff.1:187
#, no-wrap
msgid "%[-][WIDTH][.[PREC]]{doxX}n"
msgstr "%[-][LARGEUR][.[PRÉC]]{doxX}n"
#. type: Plain text
#: C/man1/diff.1:190
msgid "printf-style spec for input line number"
msgstr "spécifications de type printf pour le numéro de ligne d'entrée."
#. type: Plain text
#: C/man1/diff.1:192
msgid "Both GFMT and LFMT may contain:"
msgstr "I<GFMT> et I<LFMT> peuvent tous deux contenir\\ :"
#. type: TP
#: C/man1/diff.1:192
#, no-wrap
msgid "%%"
msgstr "%%"
#. type: Plain text
#: C/man1/diff.1:195
msgid "%"
msgstr "%"
#. type: TP
#: C/man1/diff.1:195
#, no-wrap
msgid "%c'C'"
msgstr "%c'C'"
#. type: Plain text
#: C/man1/diff.1:198
msgid "the single character C"
msgstr "l'unique caractère C ;"
#. type: TP
#: C/man1/diff.1:198
#, no-wrap
msgid "%c'\\eOOO'"
msgstr "%c'\\eOOO'"
#. type: Plain text
#: C/man1/diff.1:201
msgid "the character with octal code OOO"
msgstr "le caractère dont le code octal est OOO ;"
#. type: TP
#: C/man1/diff.1:201
#, no-wrap
msgid "C"
msgstr "C"
#. type: Plain text
#: C/man1/diff.1:204
msgid "the character C (other characters represent themselves)"
msgstr "le caractère C (les autres caractères se représentent eux-mêmes)."
#. type: TP
#: C/man1/diff.1:204 C/man1/sdiff.1:54
#, no-wrap
msgid "B<-d>, B<--minimal>"
msgstr "B<-d>, B<--minimal>"
#. type: Plain text
#: C/man1/diff.1:207 C/man1/sdiff.1:57
msgid "try hard to find a smaller set of changes"
msgstr "Essayer de trouver un ensemble de changements minimal."
#. type: TP
#: C/man1/diff.1:207
#, no-wrap
msgid "B<--horizon-lines>=I<NUM>"
msgstr "B<--horizon-lines=>I<n>"
#. type: Plain text
#: C/man1/diff.1:210
msgid "keep NUM lines of the common prefix and suffix"
msgstr "Utiliser I<n> lignes pour le préfixe et le suffixe commun."
#. type: TP
#: C/man1/diff.1:210
#, no-wrap
msgid "B<--speed-large-files>"
msgstr "B<--speed-large-files>"
#. type: Plain text
#: C/man1/diff.1:213
msgid "assume large files and many scattered small changes"
msgstr ""
"Supposer que les fichiers sont de grande taille et contiennent de nombreux "
"petits changements dispersés."
#. type: Plain text
#: C/man1/diff.1:224
msgid ""
"FILES are `FILE1 FILE2' or `DIR1 DIR2' or `DIR FILE...' or `FILE... DIR'. "
"If B<--from-file> or B<--to-file> is given, there are no restrictions on FILE"
"(s). If a FILE is `-', read standard input. Exit status is 0 if inputs are "
"the same, 1 if different, 2 if trouble."
msgstr ""
"Les fichiers sont «\\ I<fichier1> I<fichier2>\\ », «\\ I<répertoire1> "
"I<répertoire2>\\ », «\\ I<répertoire> I<fichier>...\\ », «\\ I<fichier>..."
"I<répertoire>\\ ». Avec les options B<--from-file> ou B<--to-file>, il n'y a "
"aucune restriction sur les I<fichier>s. Si un I<fichier> vaut B<->, l'entrée "
"standard est lue. Le code de retour vaut B<0> si les entrées sont "
"identiques, B<1> si elles diffèrent, et B<2> en cas de problème."
#. type: Plain text
#: C/man1/diff.1:227
msgid ""
"Written by Paul Eggert, Mike Haertel, David Hayes, Richard Stallman, and Len "
"Tower."
msgstr ""
"Écrit par Paul Eggert, Mike Haertel, David Hayes, Richard Stallman et Len "
"Tower."
#. type: Plain text
#: C/man1/diff.1:241
msgid "wdiff(1), cmp(1), diff3(1), sdiff(1), patch(1)"
msgstr "B<wdiff>(1), B<cmp>(1), B<diff3>(1), B<sdiff>(1), B<patch>(1)"
#. type: Plain text
#: C/man1/diff.1:249
msgid ""
"The full documentation for B<diff> is maintained as a Texinfo manual. If "
"the B<info> and B<diff> programs are properly installed at your site, the "
"command"
msgstr ""
"La documentation complète de B<diff> est disponible dans un manuel Texinfo. "
"Si les programmes B<info> et B<diff> sont correctement installés, la commande"
#. type: Plain text
#: C/man1/diff.1:251
msgid "B<info diff>"
msgstr "B<info diff>"
#. type: TH
#: C/man1/diff3.1:2
#, no-wrap
msgid "DIFF3"
msgstr "DIFF3"
#. type: Plain text
#: C/man1/diff3.1:5
msgid "diff3 - compare three files line by line"
msgstr "diff3 - Comparer trois fichiers ligne à ligne"
#. type: Plain text
#: C/man1/diff3.1:8
msgid "B<diff3> [I<OPTION>]... I<MYFILE OLDFILE YOURFILE>"
msgstr "B<diff3> [I<opion>]... I<monfichier ancienfichier autrefichier>"
#. type: Plain text
#: C/man1/diff3.1:10
msgid "Compare three files line by line."
msgstr "Comparer trois fichiers ligne à ligne."
#. type: TP
#: C/man1/diff3.1:12
#, no-wrap
msgid "B<-A>, B<--show-all>"
msgstr "B<-A>, B<--show-all>"
#. type: Plain text
#: C/man1/diff3.1:15
msgid "output all changes, bracketing conflicts"
msgstr "Afficher tous les changements, en plaçant les conflits entre chevrons."
#. type: Plain text
#: C/man1/diff3.1:19
msgid ""
"output ed script incorporating changes from OLDFILE to YOURFILE into MYFILE"
msgstr ""
"Afficher un script « ed » constitué des changements entre I<ancienfichier> "
"et I<autrefichier> dans I<monfichier>."
#. type: TP
#: C/man1/diff3.1:19
#, no-wrap
msgid "B<-E>, B<--show-overlap>"
msgstr "B<-E>, B<--show-overlap>"
#. type: Plain text
#: C/man1/diff3.1:22
msgid "like B<-e>, but bracket conflicts"
msgstr "Comme B<-e>, mais en plaçant les conflits entre chevrons."
#. type: TP
#: C/man1/diff3.1:22
#, no-wrap
msgid "B<-3>, B<--easy-only>"
msgstr "B<-3>, B<--easy-only>"
#. type: Plain text
#: C/man1/diff3.1:25
msgid "like B<-e>, but incorporate only nonoverlapping changes"
msgstr "Comme B<-e>, mais en n'incorporant que les changements non redondants."
#. type: TP
#: C/man1/diff3.1:25
#, no-wrap
msgid "B<-x>, B<--overlap-only>"
msgstr "B<-x>, B<--overlap-only>"
#. type: Plain text
#: C/man1/diff3.1:28
msgid "like B<-e>, but incorporate only overlapping changes"
msgstr "Comme B<-e>, mais en n'incorporant que les changements redondants."
#. type: TP
#: C/man1/diff3.1:28
#, no-wrap
msgid "B<-X>"
msgstr "B<-X>"
#. type: Plain text
#: C/man1/diff3.1:31
msgid "like B<-x>, but bracket conflicts"
msgstr "Comme B<-x>, mais en plaçant les conflits entre chevrons."
#. type: TP
#: C/man1/diff3.1:31
#, no-wrap
msgid "B<-i>"
msgstr "B<-i>"
#. type: Plain text
#: C/man1/diff3.1:34
msgid "append `w' and `q' commands to ed scripts"
msgstr "Ajouter les commandes «\\ w\\ » et «\\ q\\ » aux scripts ed."
#. type: TP
#: C/man1/diff3.1:34
#, no-wrap
msgid "B<-m>, B<--merge>"
msgstr "B<-m>, B<--merge>"
#. type: Plain text
#: C/man1/diff3.1:38
msgid ""
"output actual merged file, according to B<-A> if no other options are given"
msgstr ""
"Afficher les fichiers vraiment fusionnés, d'après B<-A> si aucune autre "
"option n'est donnée."
#. type: TP
#: C/man1/diff3.1:47 C/man1/sdiff.1:60
#, no-wrap
msgid "B<--diff-program>=I<PROGRAM>"
msgstr "B<--diff-program=>I<programme>"
#. type: Plain text
#: C/man1/diff3.1:50 C/man1/sdiff.1:63
msgid "use PROGRAM to compare files"
msgstr "Utiliser I<programme> pour comparer les fichiers."
#. type: TP
#: C/man1/diff3.1:50
#, no-wrap
msgid "B<-L>, B<--label>=I<LABEL>"
msgstr "B<-L>, B<--label=>I<étiquette>"
#. type: Plain text
#: C/man1/diff3.1:54
msgid "use LABEL instead of file name (can be repeated up to three times)"
msgstr ""
"Utiliser I<étiquette> au lieu du nom de fichier (peut être répété jusqu'à "
"trois fois)."
#. type: Plain text
#: C/man1/diff3.1:63
msgid ""
"The default output format is a somewhat human-readable representation of the "
"changes."
msgstr ""
"Le format d'affichage par défaut est une représentation à peu près lisible "
"des modifications."
#. type: Plain text
#: C/man1/diff3.1:66
msgid ""
"The B<-e>, B<-E>, B<-x>, B<-X> (and corresponding long) options cause an ed "
"script to be output instead of the default."
msgstr ""
"Avec les options B<-e>, B<-E>, B<-x> et B<-X> (et les formes longues "
"correspondantes) un script « ed » est affiché à la place de l'affichage par "
"défaut."
#. type: Plain text
#: C/man1/diff3.1:70
msgid ""
"Finally, the B<-m> (B<--merge>) option causes diff3 to do the merge "
"internally and output the actual merged file. For unusual input, this is "
"more robust than using ed."
msgstr ""
"Enfin, avec l'option B<-m> (B<--merge>), B<diff3> fait la fusion en interne "
"et affiche le fichier vraiment fusionné. Pour les entrées inhabituelles, "
"c'est plus robuste que l'utilisation de « ed »."
#. type: Plain text
#: C/man1/diff3.1:73
msgid ""
"If a FILE is `-', read standard input. Exit status is 0 if successful, 1 if "
"conflicts, 2 if trouble."
msgstr ""
"Si un I<fichier> vaut B<->, l'entrée standard est lue. Le code de retour "
"vaut B<0> en cas de succès, B<1> en cas de conflit, et B<2> en cas de "
"problème."
#. type: Plain text
#: C/man1/diff3.1:75
msgid "Written by Randy Smith."
msgstr "Écrit par Randy Smith."
#. type: Plain text
#: C/man1/diff3.1:89
msgid "cmp(1), diff(1), sdiff(1)"
msgstr "B<cmp>(1), B<diff>(1), B<sdiff>(1)"
#. type: Plain text
#: C/man1/diff3.1:97
msgid ""
"The full documentation for B<diff3> is maintained as a Texinfo manual. If "
"the B<info> and B<diff3> programs are properly installed at your site, the "
"command"
msgstr ""
"La documentation complète de B<diff3> est disponible dans un manuel Texinfo. "
"Si les programmes B<info> et B<diff3> sont correctement installés, la "
"commande"
#. type: Plain text
#: C/man1/diff3.1:99
msgid "B<info diff3>"
msgstr "B<info diff3>"
#. type: TH
#: C/man1/sdiff.1:2
#, no-wrap
msgid "SDIFF"
msgstr "SDIFF"
#. type: Plain text
#: C/man1/sdiff.1:5
msgid "sdiff - side-by-side merge of file differences"
msgstr ""
"sdiff - Fusionner morceau par morceau les différences entre les fichiers"
#. type: Plain text
#: C/man1/sdiff.1:8
msgid "B<sdiff> [I<OPTION>]... I<FILE1 FILE2>"
msgstr "B<sdiff> [I<option>] ... I<fichier1 fichier2>"
#. type: Plain text
#: C/man1/sdiff.1:10
msgid "Side-by-side merge of differences between FILE1 and FILE2."
msgstr "Fusionner les différences entre I<fichier1> et I<fichier2>."
#. type: TP
#: C/man1/sdiff.1:12
#, no-wrap
msgid "B<-o>, B<--output>=I<FILE>"
msgstr "B<-o>, B<--output=>I<fichier>"
#. type: Plain text
#: C/man1/sdiff.1:15
msgid "operate interactively, sending output to FILE"
msgstr "Opérer interactivement, en redirigeant la sortie vers I<fichier>."
#. type: Plain text
#: C/man1/sdiff.1:18
msgid "consider upper- and lower-case to be the same"
msgstr "Ne pas tenir compte des différences entre majuscules et minuscules."
#. type: TP
#: C/man1/sdiff.1:24
#, no-wrap
msgid "B<-W>, B<--ignore-all-space>"
msgstr "B<-W>, B<--ignore-all-space>"
#. type: TP
#: C/man1/sdiff.1:39
#, no-wrap
msgid "B<-w>, B<--width>=I<NUM>"
msgstr "B<-w>, B<--width=>I<n>"
#. type: TP
#: C/man1/sdiff.1:42
#, no-wrap
msgid "B<-l>, B<--left-column>"
msgstr "B<-l>, B<--left-column>"
#. type: TP
#: C/man1/sdiff.1:45
#, no-wrap
msgid "B<-s>, B<--suppress-common-lines>"
msgstr "B<-s>, B<--suppress-common-lines>"
#. type: Plain text
#: C/man1/sdiff.1:54
msgid "tab stops at every NUM (default 8) print columns"
msgstr "Les tabulations s'arrêtent toutes les I<n> (8 par défaut) colonnes."
#. type: TP
#: C/man1/sdiff.1:57
#, no-wrap
msgid "B<-H>, B<--speed-large-files>"
msgstr "B<-H>, B<--speed-large-files>"
#. type: Plain text
#: C/man1/sdiff.1:60
msgid "assume large files, many scattered small changes"
msgstr ""
"Supposer que les fichiers sont de grande taille et contiennent de nombreux "
"petits changements dispersés."
#. type: Plain text
#: C/man1/sdiff.1:72
msgid ""
"If a FILE is `-', read standard input. Exit status is 0 if inputs are the "
"same, 1 if different, 2 if trouble."
msgstr ""
"Si un I<fichier> vaut B<->, l'entrée standard est lue. Le code de retour "
"vaut B<0> si les entrées sont identiques, B<1> si elles diffèrent, et B<2> "
"en cas de problème."
#. type: Plain text
#: C/man1/sdiff.1:74
msgid "Written by Thomas Lord."
msgstr "Écrit par Thomas Lord."
#. type: Plain text
#: C/man1/sdiff.1:88
msgid "cmp(1), diff(1), diff3(1)"
msgstr "B<cmp>(1), B<diff>(1), B<diff3>(1)"
#. type: Plain text
#: C/man1/sdiff.1:96
msgid ""
"The full documentation for B<sdiff> is maintained as a Texinfo manual. If "
"the B<info> and B<sdiff> programs are properly installed at your site, the "
"command"
msgstr ""
"La documentation complète de B<sdiff> est disponible dans un manuel Texinfo. "
"Si les programmes B<info> et B<sdiff> sont correctement installés, la "
"commande"
#. type: Plain text
#: C/man1/sdiff.1:98
msgid "B<info sdiff>"
msgstr "B<info sdiff>"
#~ msgid "April 2010"
#~ msgstr "Avril 2010"
#~ msgid "Output nothing; yield exit status only."
#~ msgstr "Ne rien afficher, retourner uniquement le code de retour."
#~ msgid "Output this help."
#~ msgstr "Afficher l'aide-mémoire."
#~ msgid ""
#~ "Report bugs to: bug-diffutils@gnu.org GNU diffutils home page: "
#~ "E<lt>http://www.gnu.org/software/diffutils/E<gt> General help using GNU "
#~ "software: E<lt>http://www.gnu.org/gethelp/E<gt>"
#~ msgstr ""
#~ "Signalez toute anomalie à : bug-diffutils@gnu.org\n"
#~ ".br\n"
#~ "Page d'accueil de GNU diffutils : E<lt>http://www.gnu.org/software/";
#~ "diffutils/E<gt>\n"
#~ ".br\n"
#~ "Aide générale pour l'utilisation de logiciels GNU : E<lt>http://www.gnu.";
#~ "org/gethelp/E<gt>"
#~ msgid "Output unmerged changes, bracketing conflicts."
#~ msgstr ""
#~ "Afficher les changements non fusionnés, en plaçant les conflits entre "
#~ "chevrons."
#~ msgid "Output overlapping changes."
#~ msgstr "Afficher les changements redondants non fusionnés."
#~ msgid "Output overlapping changes, bracketing them."
#~ msgstr "Afficher les changements redondants entre chevrons."
#~ msgid "Output merged file instead of ed script (default B<-A>)."
#~ msgstr ""
#~ "Afficher les fichiers fusionnés au lieu du script ed (B<-A> par défaut)."
#~ msgid "April 2002"
#~ msgstr "Avril 2002"
#~ msgid "If a FILE is `-' or missing, read standard input."
#~ msgstr ""
#~ "Lorsque FICHIER vaut «\\ -\\ » ou est omis, l'entrée standard est lue."
#~ msgid "Copyright \\(co 2002 Free Software Foundation, Inc."
#~ msgstr "Copyright \\(co 2002 Free Software Foundation, Inc."
#~ msgid ""
#~ "This program comes with NO WARRANTY, to the extent permitted by law. You "
#~ "may redistribute copies of this program under the terms of the GNU "
#~ "General Public License. For more information about these matters, see "
#~ "the file named COPYING."
#~ msgstr ""
#~ "Ce programme est fourni SANS GARANTIE dans la mesure autorisée par la "
#~ "loi. Vous pouvez en redistribuer des copies sous les termes de la GNU "
#~ "General Public License. Pour plus d'informations à ce sujet, reportez-"
#~ "vous au fichier appelé COPYING."
#~ msgid "If a FILE is `-', read standard input."
#~ msgstr "L'entrée standard est lue quand FICHIER vaut «\\ -\\ »."
#~ msgid "Output at most NUM (default 130) columns per line."
#~ msgstr "Afficher au plus N colonnes par ligne (valeur par défaut\\ : 130)."
Attachment:
signature.asc
Description: OpenPGP digital signature